[PATCH] "master" should be treated no differently from any other branch
- From
- Andy Parkins <andyparkins@gmail.com>
- Date
- Dec 14, 2006, 15:19 UTC
- Message-ID
- <200612141519.44294.andyparkins@gmail.com>
This patch makes all merge log messages of the form:
Merge branch XXXX into YYYY
Regardless of whether YYYY is master or not.
"master" shouldn't get special treatment; making different log messages based on the name of the branch is bad form. What if a user likes "my/master" or "my/head" as their master branch?
Signed-off-by: Andy Parkins <andyparkins@gmail.com> --- builtin-fmt-merge-msg.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c index 87d3d63..99edb75 100644 --- a/builtin-fmt-merge-msg.c +++ b/builtin-fmt-merge-msg.c @@ -331,10 +331,7 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix) printf(" of %s", srcs.list[i]); } - if (!strcmp("master", current_branch)) - putchar('\n'); - else - printf(" into %s\n", current_branch); + printf(" into %s\n", current_branch); if (merge_summary) { struct commit *head;
-- 1.4.4.1.g3ece-dirty