diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-06-24 01:10:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-24 01:10:27 -0700 |
| commit | 86378b32895ee5d788491b8407608a54e5cf064c (patch) | |
| tree | 673086ad557809bdc6b3811b0db89ebf56df3ba8 | |
| parent | bc1f262d67cbe1c736c5dca911f6f085f47ac9bb (diff) | |
| download | git-86378b32895ee5d788491b8407608a54e5cf064c.tar.gz git-86378b32895ee5d788491b8407608a54e5cf064c.tar.xz | |
git-pull: abort when fmt-merge-msg fails.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rwxr-xr-x | git-pull.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-pull.sh b/git-pull.sh index 4611ae644..bdd393992 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -99,5 +99,5 @@ case "$strategy_args" in ;; esac -merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") +merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") || exit git-merge $no_summary $no_commit $strategy_args "$merge_name" HEAD $merge_head |