[PATCH 19/24] merge script: handle -m --log correctly
From: Jonathan Nieder <hidden>
Date: 2016-06-15 22:49:19
Subsystem:
the rest · Maintainer:
Linus Torvalds
Based on v1.7.1.1~23^2 (merge: --log appends shortlog to message if specified, 2010-05-11). Without this change, the scripted (non-builtin) merge does not pass t7604. Cc: Tay Ray Chuan <redacted> Signed-off-by: Jonathan Nieder <redacted> --- contrib/examples/git-merge.sh | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/contrib/examples/git-merge.sh b/contrib/examples/git-merge.sh
index bab3da9..91e33a3 100755
--- a/contrib/examples/git-merge.sh
+++ b/contrib/examples/git-merge.sh@@ -294,12 +294,18 @@ else # the given message. If remote is invalid we will die # later in the common codepath so we discard the error # in this loop. - merge_name=$(for remote + merge_msg="$( + for remote do merge_name "$remote" - done | git fmt-merge-msg $log_arg - ) - merge_msg="${merge_msg:+$merge_msg$LF$LF}$merge_name" + done | + if test "$have_message" = t + then + git fmt-merge-msg -m "$merge_msg" $log_arg + else + git fmt-merge-msg $log_arg + fi + )" fi head=$(git rev-parse --verify "$head_arg"^0) || usage
--
1.7.2.1.544.ga752d.dirty