From 9bcbb1c218d075d8b180cfef4c9089f868151e7e Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 28 Dec 2012 15:29:31 -0800 Subject: merge --no-edit: do not credit people involved in the side branch The credit lines "By" and "Via" to credit authors and committers for their contributions on the side branch are meant as a hint to the integrator to decide whom to mention in the log message text. After the integrator saves the message in the editor, they are meant to go away and that is why they are commented out. When a merge is recorded without editing the generated message, however, its contents do not go through the normal stripspace() and these lines are left in the merge. Stop producing them when we know the merge is going to be recorded without editing, i.e. when --no-edit is given. Signed-off-by: Junio C Hamano --- builtin/merge.c | 1 + 1 file changed, 1 insertion(+) (limited to 'builtin/merge.c') diff --git a/builtin/merge.c b/builtin/merge.c index e81fde6d79..c5d3551567 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1324,6 +1324,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix) memset(&opts, 0, sizeof(opts)); opts.add_title = !have_message; opts.shortlog_len = shortlog_len; + opts.credit_people = (0 < option_edit); fmt_merge_msg(&merge_names, &merge_msg, &opts); if (merge_msg.len) -- cgit v1.2.3