Skip to content

Commit

Permalink
Ensure git-pull fails if git-merge fails.
Browse files Browse the repository at this point in the history
If git-merge exits with a non-zero exit status so should git-pull.
This way the caller of git-pull knows the task did not complete
successfully simply by checking the process exit status.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
spearce authored and Junio C Hamano committed Dec 28, 2006
1 parent 0bb733c commit bf69958
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion git-pull.sh
Expand Up @@ -119,5 +119,5 @@ case "$strategy_args" in
esac

merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") || exit
git-merge $no_summary $no_commit $squash $strategy_args \
exec git-merge $no_summary $no_commit $squash $strategy_args \
"$merge_name" HEAD $merge_head

0 comments on commit bf69958

Please sign in to comment.