Re: [Fwd: Issue with Merge Commits and using 'git pull --rebase' (Was: Re: Trying to understand git)]

[Santi Béjar <santi agolina net>]

2009/4/21 Behdad Esfahbod <behdad behdad org>:
> FYI.
>
> -------- Original Message --------
> Subject: Issue with Merge Commits and using 'git pull --rebase' (Was: Re:
> Trying to understand git)
> Date: Mon, 20 Apr 2009 22:45:38 +0100
> From: Simos Xenitellis <simos lists googlemail com>
> To: Milo Casagrande <milo casagrande name>
> CC: Gnome i18n <gnome-i18n gnome org>
>
> 2009/4/20 Milo Casagrande <milo casagrande name>:
>>
>> Hi,
>>
>> I'm here again with silly questions trying to understand the correct use
>> of git...
>>
>> Today I did a commit for pitivi [1], I was in master (and my copy is
>> still in master) and I did the commit there, when I checked at cgit the
>> green box with master written on it was on my commit description.
>>
>> Tonight I'm told by our Italian coordinator that probably I've done
>> something wrong, because looks like the same commit I did has been
>> redone [2].
>>
>> What did I do wrong?
>>
>> I really don't understand... sorry...
>>
>> [1]
>>
>> http://git.gnome.org/cgit/pitivi/commit/?id=2dc963da049c0eb05ac2d4887ed88415fef181af
>> [2]
>>
>> http://git.gnome.org/cgit/pitivi/commit/?id=2a7f5b319cb55c8851ab5141d55c42e5e5dca59f
>>

They look like the same when looking at the cgit output, but one is a
normal commit and the other a merge. In cgit they look the same
because for merges you get the diff between the commit and the first
parent (the changes you incorporate while doing the merge), but as the
other branch has only one commit they are normally the same.

>
> Oh, you did a 'merge-commit'. I did one of those to 'gtk+', no less...
> The technical description is at
> http://live.gnome.org/Git/Help/ExtraMergeCommits
> and apparently, now, git.gnome.org is supposed to detect those and
> give you an error message.
> It is not clear why your commit was not caught in your case.
>

Because, most probably, he used 'git merge --no-commit; git commit'
and provided a commit message:

$ git show  2a7f5b319cb55c8851ab5141d55c42e5e5dca59f
commit 2a7f5b319cb55c8851ab5141d55c42e5e5dca59f
Merge: af64b94 2dc963d
Author: Edward Hervey <bilboed bilboed com>
Date:   Mon Apr 20 16:22:57 2009

    Merging translations

    Merge commit 'gnome/master'


HTH,
Santi