Thread (7 messages) flat view 7 messages, 3 authors, 2016-06-15

Re: [PATCH 1/3] merge: a random object may not necssarily be a commit

From: Yann Droneaud <hidden>
Date: 2016-06-15 22:56:35

Possibly related (same subject, not in this thread)

Hi,

Le lundi 01 avril 2013 à 12:57 -0700, Junio C Hamano a écrit :
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 <redacted>
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 <redacted>

PS: there's a typo in the commit title :)

Regards.

-- 
Yann Droneaud
OPTEYA
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help