On Tue, Aug 17, 2010 at 3:06 PM, Jonathan Nieder <jrnieder@xxxxxxxxx> wrote:
> 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 <rctay89@xxxxxxxxx>
> Signed-off-by: Jonathan Nieder <jrnieder@xxxxxxxxx>
Thanks for the heads up.
> 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
hmm, when did git-fmt-merge-msg learn -m? Mine (1.7.2.1.219.gf2a27) doesn't.
--
Cheers,
Ray Chuan
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html