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

2013-04-02 Thread Jeff King
On Tue, Apr 02, 2013 at 08:02:13AM -0700, Junio C Hamano wrote: > >> + if (remote_head->util) { > >> + struct merge_remote_desc *desc; > >> + desc = merge_remote_util(remote_head); > >> + if (desc && desc->obj && desc->obj->type == OBJ_TAG) { > >> + str

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

2013-04-02 Thread Junio C Hamano
Jeff King writes: > On Mon, Apr 01, 2013 at 12:57:17PM -0700, Junio C Hamano wrote: > >> The user could have said "git merge $(git rev-parse v1.0.0)"; we >> shouldn't mark it as "Merge commit '1598fb...'" as the merge >> name, even though such an invocation might be crazy. >> >> We could eve

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

2013-04-01 Thread Jeff King
On Mon, Apr 01, 2013 at 12:57:17PM -0700, Junio C Hamano wrote: > The user could have said "git merge $(git rev-parse v1.0.0)"; we > shouldn't mark it as "Merge commit '1598fb...'" as the merge > name, even though such an invocation might be crazy. > > We could even read the "tag " header fro

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

2013-04-01 Thread Yann Droneaud
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 '1598fb...'" as the merge > name, even though such an invocation might be crazy. > > We could even read the "tag " header

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

2013-04-01 Thread Junio C Hamano
The user could have said "git merge $(git rev-parse v1.0.0)"; we shouldn't mark it as "Merge commit '1598fb...'" 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 no