Re: [PATCH] merge: indicate remote tracking branches in merge message
- From
Jeff King <peff@peff.net>
- Date
- Aug 9, 2009, 07:14 UTC
- Message-ID
- <20090809071446.GA24221@coredump.intra.peff.net>
- In-Reply-To
- <20090809065936.GA24112@coredump.intra.peff.net>
On Sun, Aug 09, 2009 at 02:59:36AM -0400, Jeff King wrote:
Show 7 quoted lines
> This is a repost of > > http://article.gmane.org/gmane.comp.version-control.git/119909 > > which got no response from you. I think it is a good idea, but I am not > deeply committed to it. I mainly want a yes or no so I can clean it out > of my patch queue.
Ah, it may have had to do with the fact that it doesn't actually pass the tests. There is a trivial text update needed in t3409, which calls "git merge origin/master" during its setup phase.
Updated, passing-all-tests patch is below. Sorry for the confusion.
-- >8 -- Subject: [PATCH] merge: indicate remote tracking branches in merge message
Previously when merging directly from a local tracking branch like:
git merge origin/master
The merge message said:
Merge commit 'origin/master'
* commit 'origin/master':
...Instead, let's be more explicit about what we are merging:
Merge remote branch 'origin/master'
* origin/master:
...We accomplish this by recognizing remote tracking branches in git-merge when we build the simulated FETCH_HEAD output that we feed to fmt-merge-msg.
Signed-off-by: Jeff King <peff@peff.net> --- builtin-merge.c | 11 +++++++++++ t/t3409-rebase-preserve-merges.sh | 2 +- 2 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/builtin-merge.c b/builtin-merge.c index 82b5466..1f59567 100644 --- a/builtin-merge.c +++ b/builtin-merge.c @@ -378,6 +378,17 @@ static void merge_name(const char *remote, struct strbuf *msg) goto cleanup; } + strbuf_setlen(&buf, 0); + strbuf_addstr(&buf, "refs/remotes/"); + strbuf_addstr(&buf, remote); + resolve_ref(buf.buf, branch_head, 0, 0); + + if (!hashcmp(remote_head->sha1, branch_head)) { + strbuf_addf(msg, "%s\t\tremote branch '%s' of .\n", + sha1_to_hex(branch_head), remote); + goto cleanup; + } + /* See if remote matches <name>^^^.. or <name>~<number> */ for (len = 0, ptr = remote + strlen(remote); remote < ptr && ptr[-1] == '^'; diff --git a/t/t3409-rebase-preserve-merges.sh b/t/t3409-rebase-preserve-merges.sh index e6c8327..2ce0236 100755 --- a/t/t3409-rebase-preserve-merges.sh +++ b/t/t3409-rebase-preserve-merges.sh @@ -71,7 +71,7 @@ test_expect_success 'rebase -p fakes interactive rebase' ' git fetch && git rebase -p origin/topic && test 1 = $(git rev-list --all --pretty=oneline | grep "Modify A" | wc -l) && - test 1 = $(git rev-list --all --pretty=oneline | grep "Merge commit" | wc -l) + test 1 = $(git rev-list --all --pretty=oneline | grep "Merge remote branch" | wc -l) ) '
-- 1.6.4.178.g7a987