X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=git-pull-script;h=90ee0f322d8c569a5b02b3be1548eb990b4263c9;hb=c323ac7d9c573c5ee8b45b9b9def92a4d4d8204d;hp=49f42b5ab2896356952aee9eb2b771f422011f02;hpb=c5434dead6a52a48c520dfa3d8ed24dc3673ab1a;p=git.git

diff --git a/git-pull-script b/git-pull-script
index 49f42b5a..90ee0f32 100755
--- a/git-pull-script
+++ b/git-pull-script
@@ -6,18 +6,16 @@ merge_name=$(echo "$1" | sed 's:\.git/*$::')
 merge_head=HEAD
 if [ "$2" ]
 then
-   merge_name="'$2' branch from
-
-	$merge_name"
+   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_head"
+git-fetch-script "$merge_repo" "$merge_head" || exit 1
 
 git-resolve-script \
 	"$(cat "$GIT_DIR"/HEAD)" \
-	"$(cat "$GIT_DIR"/MERGE_HEAD)" \
+	"$(cat "$GIT_DIR"/FETCH_HEAD)" \
 	"$merge_name"