On 1/25/07, Michael S. Tsirkin <mst@xxxxxxxxxxxxxx> wrote:
Hi!
I like to do
$git fetch <URL>
$git log FETCH_HEAD
$git merge FETCH_HEAD
I would expect this to be equivalent to
git pull <URL>
However, the message that git merge produces in this case
is less than informative:
commit 3c11f564846227d80aa76b579c974913c3602862
Merge: 9871244... f5e6d63...
Author: Michael S. Tsirkin <mst@xxxxxxxxxxxxxx>
Date: Thu Jan 25 16:46:51 2007 +0200
Merge commit 'FETCH_HEAD' into ofed_1_2
I note that FETCH_HEAD actually has the information on where
the commit came from:
$cat .git/FETCH_HEAD
f5e6d63839970f4785c36b6be3835f037e74195c ssh://<hidden>/usr/src/ofed_1_2
So can not git merge be enhanced to put this data in commit log?
Does it need to?
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-)"
In the long run you'll almost certainly find this commit message
useless, though.
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html