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 05:14:43 -0400 [thread overview]
Message-ID: <20090809091443.GA676@coredump.intra.peff.net> (raw)
In-Reply-To: <20090809074035.GA4778@coredump.intra.peff.net>
On Sun, Aug 09, 2009 at 03:40:35AM -0400, Jeff King wrote:
> > Shouldn't it instead feed what it got from the end user to the dwim
> > machinery, and make sure it dwims into refs/remotes/ hierarchy?
>
> I'm not sure that is all that different in practice than what is
> happening now. Mainly I did it the way I did so that I didn't touch the
> code path for detecting local branches.
>
> But assuming they are functionally identical, I think your patch is much
> more readable.
I tested your patch; the two methods aren't identical. In fact, yours
fixes a bug. :)
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'
which we could preserve that by renaming the tags, as below.
---
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 48e0088..9d0db2a 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -306,13 +306,13 @@ test_expect_success 'set up more tangled history' '
git checkout master &&
git merge tangle &&
git checkout -b reach &&
- test_commit reach &&
+ test_commit reach-1 &&
git checkout master &&
git checkout -b octopus-a &&
- test_commit octopus-a &&
+ test_commit octopus-a-1 &&
git checkout master &&
git checkout -b octopus-b &&
- test_commit octopus-b &&
+ test_commit octopus-b-1 &&
git checkout master &&
test_commit seventh &&
git merge octopus-a octopus-b
@@ -327,12 +327,12 @@ cat > expect <<\EOF
*-. \ Merge branches 'octopus-a' and 'octopus-b'
|\ \ \
* | | | seventh
-| | * | octopus-b
+| | * | octopus-b-1
| |/ /
|/| |
-| * | octopus-a
+| * | octopus-a-1
|/ /
-| * reach
+| * reach-1
|/
* Merge branch 'tangle'
|\
next prev parent reply other threads:[~2009-08-09 9:14 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 [this message]
2009-08-09 10:00 ` Jeff King
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=20090809091443.GA676@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).