git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Alex Riesen" <raa.lkml@gmail.com>
To: "Michael S. Tsirkin" <mst@mellanox.co.il>
Cc: git@vger.kernel.org
Subject: Re: git merge FETCH_HEAD produced bad commit message
Date: Fri, 26 Jan 2007 15:32:41 +0100	[thread overview]
Message-ID: <81b0412b0701260632l2181ef10i8d49ee9a795228b7@mail.gmail.com> (raw)
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?)

  reply	other threads:[~2007-01-26 14:33 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-01-25 14:52 git merge FETCH_HEAD produced bad commit message Michael S. Tsirkin
2007-01-26  9:02 ` Alex Riesen
2007-01-26 14:24   ` Michael S. Tsirkin
2007-01-26 14:32     ` Alex Riesen [this message]
2007-01-26 14:42       ` Michael S. Tsirkin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=81b0412b0701260632l2181ef10i8d49ee9a795228b7@mail.gmail.com \
    --to=raa.lkml@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=mst@mellanox.co.il \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).