summaryrefslogtreecommitdiff
path: root/git-pull.sh
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2006-12-28 07:35:01 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-28 09:07:37 (GMT)
commitbf699582fd7be26f7809858941fa831380e5bce7 (patch)
tree3a2228b8f45b0e2e05f0bedabee839a6dacf8874 /git-pull.sh
parent0bb733c91cb472a1a5b62381ff4037c6fb124e38 (diff)
downloadgit-bf699582fd7be26f7809858941fa831380e5bce7.zip
git-bf699582fd7be26f7809858941fa831380e5bce7.tar.gz
git-bf699582fd7be26f7809858941fa831380e5bce7.tar.bz2
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>
Diffstat (limited to 'git-pull.sh')
-rwxr-xr-xgit-pull.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-pull.sh b/git-pull.sh
index fd4ffb8..2725946 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