Re: [PATCH] merge: indicate remote tracking branches in merge message

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