From: "Santi Béjar" <sbejar@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Subject: [PATCH] fmt-merge-msg: detached HEAD
Date: Thu, 25 Jan 2007 16:36:45 +0100 [thread overview]
Message-ID: <87zm875d9u.fsf@gmail.com> (raw)
Do not say 'Merge ... into HEAD' when detached.
Signed-off-by: Santi Béjar <sbejar@gmail.com>
---
builtin-fmt-merge-msg.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c
index 87d3d63..8cef425 100644
--- a/builtin-fmt-merge-msg.c
+++ b/builtin-fmt-merge-msg.c
@@ -331,7 +331,8 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
printf(" of %s", srcs.list[i]);
}
- if (!strcmp("master", current_branch))
+ if (!strcmp("master", current_branch) ||
+ !strcmp("HEAD", current_branch))
putchar('\n');
else
printf(" into %s\n", current_branch);
--
1.5.0.rc2.g2fa185-dirty
next reply other threads:[~2007-01-25 15:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-25 15:36 Santi Béjar [this message]
2007-01-26 0:16 ` [PATCH] fmt-merge-msg: detached HEAD Junio C Hamano
2007-01-26 9:45 ` Santi Béjar
2007-01-26 9:59 ` Junio C Hamano
2007-01-26 10:15 ` Santi Béjar
2007-01-26 23:45 ` Junio C Hamano
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=87zm875d9u.fsf@gmail.com \
--to=sbejar@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).