X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-pull-script;h=90ee0f322d8c569a5b02b3be1548eb990b4263c9;hb=180926636e47ecfe28d03cec493af75899994f0f;hp=0585df61e241b302cf007cd75dd6e9fd3b78596a;hpb=7ef76925d9c19ef74874e1735e2436e56d0c4897;p=git.git

diff --git a/git-pull-script b/git-pull-script
index 0585df61..90ee0f32 100755
--- a/git-pull-script
+++ b/git-pull-script
@@ -1,14 +1,21 @@
 #!/bin/sh
 #
 merge_repo=$1
-merge_name=${2:-HEAD}
+
+merge_name=$(echo "$1" | sed 's:\.git/*$::')
+merge_head=HEAD
+if [ "$2" ]
+then
+   merge_name="'$2' branch of $merge_name"
+   merge_head="refs/heads/$2"
+fi
 
 : ${GIT_DIR=.git}
 : ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
 
-git-fetch-script "$merge_repo" "$merge_name"
+git-fetch-script "$merge_repo" "$merge_head" || exit 1
 
 git-resolve-script \
 	"$(cat "$GIT_DIR"/HEAD)" \
-	"$(cat "$GIT_DIR"/MERGE_HEAD)" \
-	"$merge_repo"
+	"$(cat "$GIT_DIR"/FETCH_HEAD)" \
+	"$merge_name"