git-pull: abort when fmt-merge-msg fails.
authorJunio C Hamano <junkio@cox.net>
Sat, 24 Jun 2006 08:10:27 +0000 (01:10 -0700)
committerJunio C Hamano <junkio@cox.net>
Sat, 24 Jun 2006 08:10:27 +0000 (01:10 -0700)
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-pull.sh

index 4611ae6..bdd3939 100755 (executable)
@@ -99,5 +99,5 @@ case "$strategy_args" in
        ;;
 esac
 
        ;;
 esac
 
-merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD")
+merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") || exit
 git-merge $no_summary $no_commit $strategy_args "$merge_name" HEAD $merge_head
 git-merge $no_summary $no_commit $strategy_args "$merge_name" HEAD $merge_head