From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] merge: indicate remote tracking branches in merge message
Date: Sun, 9 Aug 2009 06:00:45 -0400 [thread overview]
Message-ID: <20090809100045.GA25197@coredump.intra.peff.net> (raw)
In-Reply-To: <20090809091443.GA676@coredump.intra.peff.net>
On Sun, Aug 09, 2009 at 05:14:43AM -0400, Jeff King wrote:
> In t4202, we have a branch name and a tag name that are the same
> (octopus-a), and we "git merge octopus-a". This actually merges the tag,
> but because the branch name existed, we write "Merge branch 'octopus-a'"
> in the log, which is not true. With your patch, it does the right thing
> and says "Merge commit 'octopus-a'".
>
> The simple thing is to just update the "expect" text. Though the current
> behavior does show off the ability to collape the two branches and say
>
> Merge branches 'octopus-a' and 'octopus-b'
>
> instead of
>
> Merge commit 'octopus-a'; commit 'octopus-b'
Thinking about it for a few seconds, it's silly to try to test something
that happens to occur in a totally unrelated test. The right thing to do
is to write actual tests for this area, fix the bug, and then add the
new feature. So how about this series:
[1/3] add tests for merge message headings
[2/3] merge: fix incorrect merge message for ambiguous tag/branch
[3/3] merge: indicate remote tracking branches in merge message
-Peff
next prev parent reply other threads:[~2009-08-09 10:00 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-09 6:59 [PATCH] merge: indicate remote tracking branches in merge message Jeff King
2009-08-09 7:14 ` Jeff King
2009-08-09 7:31 ` Junio C Hamano
2009-08-09 7:40 ` Jeff King
2009-08-09 9:14 ` Jeff King
2009-08-09 10:00 ` Jeff King [this message]
2009-08-09 10:01 ` [PATCH 1/3] add tests for merge message headings Jeff King
2009-08-09 10:02 ` [PATCH 2/3] merge: fix incorrect merge message for ambiguous tag/branch Jeff King
2009-08-09 10:02 ` [PATCH 3/3] merge: indicate remote tracking branches in merge message Jeff King
2009-08-09 10:07 ` [PATCH] " Jeff King
2009-08-09 19:36 ` Junio C Hamano
2009-08-09 21:49 ` Jeff King
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090809100045.GA25197@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).