All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andy Parkins <andyparkins@gmail.com>
To: git@vger.kernel.org
Subject: [PATCH] "master" should be treated no differently from any other branch
Date: Thu, 14 Dec 2006 15:19:44 +0000	[thread overview]
Message-ID: <200612141519.44294.andyparkins@gmail.com> (raw)

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

             reply	other threads:[~2006-12-14 15:19 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-12-14 15:19 Andy Parkins [this message]
2006-12-14 15:29 ` [PATCH] "master" should be treated no differently from any other branch Johannes Schindelin
2006-12-14 15:47   ` Han-Wen Nienhuys
2006-12-14 15:57     ` Johannes Schindelin
2006-12-14 15:59     ` Han-Wen Nienhuys
2006-12-14 16:14       ` Johannes Schindelin
2006-12-15 10:29         ` Jakub Narebski
2006-12-14 18:22     ` Nicolas Pitre
2006-12-14 16:20   ` Jerome Lovy
2006-12-15 21:55     ` Junio C Hamano
2006-12-14 16:25   ` Andy Parkins
2006-12-14 16:34     ` Andy Parkins
2006-12-14 16:39     ` Johannes Schindelin
2006-12-14 17:42 ` John W. Linville
2006-12-14 18:35   ` Robin Rosenberg
2006-12-14 20:41 ` Junio C Hamano
2006-12-14 21:23   ` Andy Parkins
2006-12-14 21:30     ` Junio C Hamano
2006-12-14 21:37       ` Andy Parkins
2006-12-14 21:57         ` Shawn Pearce
2006-12-15 10:35           ` Jakub Narebski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=200612141519.44294.andyparkins@gmail.com \
    --to=andyparkins@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.