X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-pull-script;h=8e309fc98b97659d08061b0e1f1e6d4f1e43fc32;hb=cf219196a89becccb50ad4a0a667a2814ddae60f;hp=961edc481b96b0081c816520bc0c4e2cfe5a43f8;hpb=f4b3a4c30b5ea3a5de2a2597a3c53266017d02ba;p=git.git

diff --git a/git-pull-script b/git-pull-script
index 961edc48..8e309fc9 100755
--- a/git-pull-script
+++ b/git-pull-script
@@ -1,5 +1,7 @@
 #!/bin/sh
 #
+. git-sh-setup-script || die "Not a git archive"
+
 merge_repo=$1
 
 merge_name=$(echo "$1" | sed 's:\.git/*$::')
@@ -15,12 +17,9 @@ then
    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" || exit 1
 
 git-resolve-script \
 	"$(cat "$GIT_DIR"/HEAD)" \
 	"$(cat "$GIT_DIR"/FETCH_HEAD)" \
-	"$merge_name"
+	"Merge $merge_name"