From: Alex Riesen <raa.lkml@gmail.com>
Date: Fri, 26 Jan 2007 14:32:41 GMT
Subject: Re: git merge FETCH_HEAD produced bad commit message
Message-ID: <81b0412b0701260632l2181ef10i8d49ee9a795228b7@mail.gmail.com>
In-Reply-To: <20070126142420.GO10812@mellanox.co.il>

On 1/26/07, Michael S. Tsirkin <mst@mellanox.co.il> wrote:
> > Does it need to?
>
> FETCH_HEAD is not a real head name, so I think the message above is a bug.
>

For whatever Git cares - it is a real reference.

> > Is the below enough (could be line-wrapped):
> >
> > git merge --no-commit FETCH_HEAD && \
> > git commit -M "Merge $(cut -d ' ' -f 2- < $(git rev-parse
> > --git-dir)/FETCH_HEAD) \
> > into $(git name-rev HEAD | cut -d ' ' -f 2-)"
>
> Or I can just commit --amend and edit it manually.
> But that's not the point.

What is the point then? It looked like you were
complaining it were not done automatically.
I showed you how to script it. The message can be
made to look exactly as it is for git-pull. So what's wrong?

> > In the long run you'll almost certainly find this commit message
> > useless, though.
>
> Isn't 'Merge ssh://<hidden>/usr/src/ofed_1_2 info ofed_1_2' much more
> useful than Merge commit 'FETCH_HEAD'?

What for?
Isn't "Merge origin/ofed_1_2 into ofed_1_2" much more useful than
"Merge FETCH_HEAD"?
(IOW: Why don't you just save the fetch result somewhere and
have a "source description" from that?)