Re: Bug? Files are losing history after subtree merge

From: Ralf Thielow <ralf.thielow@gmail.com>
Date: Oct 2, 2013, 20:10 UTC
Message-ID: <CAN0XMOJB4wco+O9EYn3swXHG-o7sHvNY6DPbfqtOi2yFAuFiSA@mail.gmail.com>
In-Reply-To: <vpqsiwjlarx.fsf@anie.imag.fr>

On Wed, Oct 2, 2013 at 9:42 PM, Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> wrote:

Show 20 quoted lines

> Ralf Thielow <ralf.thielow@gmail.com> writes:
>
>> Hi,
>>
>> recently I did a merge where a complete repo shall be
>> merged into a specific directory of another repo. I
>> tried both the "subtree" merge strategy and the option
>> "-Xsubtree=<dir>" of "recursive". I noticed that in both
>> cases somehow the history of single files were lost
>> during these merges (with history I mean 'git log <file>'
>> and 'git log --follow <file>').
>
> This is a known bug of "git log --follow": it does not follow accross
> subtree merge. But your history is still there (try gitk on your project
> for example).
>
> Technically, a subtree merge is a merge commit in which files are
> renamed compared to the second parent. --follow does not manage this
> case.
>

Thanks for explanation. I knew the history of the repo is there, but the history of single files (and the ability to look at it) is so important that subtree-merges aren't an option for us. Such merges are rarely, luckily, but it would be nice to get it work.

Thanks

Show 23 quoted lines

>> diff --git a/t/t6029-merge-subtree.sh b/t/t6029-merge-subtree.sh
>> index 73fc240..e9a97d7 100755
>> --- a/t/t6029-merge-subtree.sh
>> +++ b/t/t6029-merge-subtree.sh
>> @@ -61,6 +61,14 @@ test_expect_success 'initial merge' '
>>       test_cmp expected actual
>>  '
>>
>> +test_expect_failure 'file keeps history after subtree merge' '
>> +     cd ../git-gui &&
>> +     git log --follow git-gui.sh >../git/expected &&
>> +     cd ../git &&
>> +     git log --follow git-gui/git-gui.sh >actual &&
>> +     test_cmp expected actual
>> +'
>> +
>
> That would actually be good to add a failing test to "document" the
> failure.
>
> --
> Matthieu Moy
> http://www-verimag.imag.fr/~moy/