| commit | 2d1495fe449de98df3b0feb5ce508c5f6418d3fa | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 19 Mar 2013 16:55:34 +0000 (19 09:55 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 19 Mar 2013 17:59:07 +0000 (19 10:59 -0700) | ||
| tree | 49cd26adba4fdfe56288888528c43075b595c74f | treesnapshot (tar.gz zip) |
| parent | 15999998fbda60552742275570947431b57108ae | commitdiff |
merge: a random object may not necssarily be a commit
The user could have said "git merge $(git rev-parse v1.0.0)"; we
shouldn't mark it as "Merge commit '15999998fb...'" as the merge
name, even though such an invocation might be crazy.
We could even read the "tag " header from the tag object and replace
the object name the user gave us, but let's not lose the information
by doing so, at least not yet.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The user could have said "git merge $(git rev-parse v1.0.0)"; we
shouldn't mark it as "Merge commit '15999998fb...'" as the merge
name, even though such an invocation might be crazy.
We could even read the "tag " header from the tag object and replace
the object name the user gave us, but let's not lose the information
by doing so, at least not yet.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/merge.c | diffblobblamehistory |