[PATCH 4/11] Ensure `git-pull` fails if `git-merge` fails.
- From
Shawn O. Pearce <spearce@spearce.org>
- Date
- Dec 28, 2006, 07:35 UTC
- Message-ID
- <20061228073501.GD17867@spearce.org>
- In-Reply-To
- <9847899e4ba836980dbfed6d0ea1c82f31f21456.1167290864.git.spearce@spearce.org>
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> --- git-pull.sh | 2 +- 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
-- 1.4.4.3.gd2e4