From: Shawn O. Pearce <spearce@spearce.org>
Date: Thu, 28 Dec 2006 07:35:01 +0000 (-0500)
Subject: Ensure `git-pull` fails if `git-merge` fails.
X-Git-Tag: v1.5.0-rc1~175
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bf699582fd7be26f7809858941fa831380e5bce7;p=git.git

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>
---

diff --git a/git-pull.sh b/git-pull.sh
index fd4ffb858..27259464f 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -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