diff --git a/git-pull-script b/git-pull-script
index 49f42b5ab2896356952aee9eb2b771f422011f02..dbef56c70b7e40c69517c3ede33544d0e9efcc8a 100755 (executable)
--- a/git-pull-script
+++ b/git-pull-script
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)" \