diff options
| author | Jeff King <peff@peff.net> | 2009-08-09 10:02:51 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-09 19:34:21 (GMT) |
| commit | 69a8b7c74192dfa7bde3937d2c84324a2cd1506b (patch) | |
| tree | 708d61212040df83649eb7095a88a201cac31af3 /builtin-merge.c | |
| parent | 751c59746c7522982214528eb653dfb61d372257 (diff) | |
| download | git-69a8b7c74192dfa7bde3937d2c84324a2cd1506b.zip git-69a8b7c74192dfa7bde3937d2c84324a2cd1506b.tar.gz git-69a8b7c74192dfa7bde3937d2c84324a2cd1506b.tar.bz2 | |
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.
In addition to a new test in t7608, we have to tweak the
expected output of t3409, which does such a merge.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge.c')
| -rw-r--r-- | builtin-merge.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/builtin-merge.c b/builtin-merge.c index f7db148..f4de73f 100644 --- a/builtin-merge.c +++ b/builtin-merge.c @@ -375,6 +375,11 @@ static void merge_name(const char *remote, struct strbuf *msg) sha1_to_hex(branch_head), remote); goto cleanup; } + if (!prefixcmp(found_ref, "refs/remotes/")) { + 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> */ |