X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-pull-script;h=8e309fc98b97659d08061b0e1f1e6d4f1e43fc32;hb=d6d8dac032e0e0c55b3edffbefd0abb00ca960fc;hp=49f42b5ab2896356952aee9eb2b771f422011f02;hpb=c5434dead6a52a48c520dfa3d8ed24dc3673ab1a;p=git.git

diff --git a/git-pull-script b/git-pull-script
index 49f42b5a..8e309fc9 100755
--- a/git-pull-script
+++ b/git-pull-script
@@ -1,23 +1,25 @@
 #!/bin/sh
 #
+. git-sh-setup-script || die "Not a git archive"
+
 merge_repo=$1
 
 merge_name=$(echo "$1" | sed 's:\.git/*$::')
 merge_head=HEAD
+type=head
+if [ "$2" = "tag" ]; then
+   type=tag
+   shift
+fi
 if [ "$2" ]
 then
-   merge_name="'$2' branch from
-
-	$merge_name"
-   merge_head="refs/heads/$2"
+   merge_name="$type '$2' of $merge_name"
+   merge_head="refs/${type}s/$2"
 fi
 
-: ${GIT_DIR=.git}
-: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
-
-git-fetch-script "$merge_repo" "$merge_head"
+git-fetch-script "$merge_repo" "$merge_head" || exit 1
 
 git-resolve-script \
 	"$(cat "$GIT_DIR"/HEAD)" \
-	"$(cat "$GIT_DIR"/MERGE_HEAD)" \
-	"$merge_name"
+	"$(cat "$GIT_DIR"/FETCH_HEAD)" \
+	"Merge $merge_name"