[PATCH] git-ssh-pull: commit-id consistency

[git.git] / git-pull-script

diff --git a/git-pull-script b/git-pull-script
index 49f42b5..90ee0f3 100755 (executable)
--- 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"