Ensure `git-pull` fails if `git-merge` fails.
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>
Shawn O. Pearce committed
Dec 28, 2006 at 02:35 UTC
bf699582fd7be26f7809858941fa831380e5bce7
1 file changed
+1
-1
git-pull.sh
+1
-1
@@ -119,5 +119,5 @@ case "$strategy_args" in
119
esac
120
121
merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") || exit
122
-git-merge $no_summary $no_commit $squash $strategy_args \
122
+exec git-merge $no_summary $no_commit $squash $strategy_args \
123
"$merge_name" HEAD $merge_head