From: Nanako Shiraishi <nanako3@lavabit.com>
Date: Wed, 09 Dec 2009 03:55:56 GMT
Subject: Re: Weird message when pulling git version 1.6.6.rc1.39.g9a42
Message-ID: <20091209125556.6117@nanako3.lavabit.com>
In-Reply-To: <7vmy1t6nye.fsf@alter.siamese.dyndns.org>

Quoting Junio C Hamano <gitster@pobox.com>

> Alejandro Riveira <ariveira@gmail.com> writes:
>
>> $ git pull
>> remote: Counting objects: 9, done.
>> remote: Compressing objects: 100% (5/5), done.
>> remote: Total 5 (delta 4), reused 0 (delta 0)
>> Unpacking objects: 100% (5/5), done.
>> From git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
>>    6035ccd..a252e74  master     -> origin/master
>> Updating 6035ccd..a252e74
>> Fast-forward (no commit created; -m option ignored) # what is this ??
>>  net/sctp/sysctl.c |    1 -
>>  1 files changed, 0 insertions(+), 1 deletions(-)
>
> Thanks for reporting.
>
> Warning about a message that the end user didn't give the command is
> clearly wrong.  I guess we would want to revert c0ecb07 (git-pull.sh: Fix
> call to git-merge for new command format, 2009-12-01), and b81e00a
> (git-merge: a deprecation notice of the ancient command line syntax,
> 2009-11-30).
>
> Reverting them will still keep 76bf488 (Do not misidentify "git merge foo
> HEAD" as an old-style invocation, 2009-12-02) that resulted in the change
> we are reverting here, so we are still ahead ;-)
>
>   http://thread.gmane.org/gmane.comp.version-control.git/134103/focus=134145

Sorry for causing too much trouble. I feel bad.

-- 
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/