Re: [PATCH 1/3] merge: a random object may not necssarily be a commit
- From
Yann Droneaud <ydroneaud@opteya.com>
- Date
- Apr 1, 2013, 22:51 UTC
- Message-ID
- <1364856675.26812.3.camel@test.quest-ce.net>
- In-Reply-To
- <1364846239-8802-2-git-send-email-gitster@pobox.com>
Hi,
Le lundi 01 avril 2013 à 12:57 -0700, Junio C Hamano a écrit :
Show 9 quoted lines
> 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>
Thanks for the patch.
I gave it a try and found the behavior rather good.
Merging a tag object by its name or by its object-id are now using the same behavor: it is more consistent.
Tested-by: Yann Droneaud <ydroneaud@opteya.com>
PS: there's a typo in the commit title :)
Regards.
-- Yann Droneaud OPTEYA