Re: BUG: git subtree split gets confused on removed and readded directory

From: David Ware <davidw@realtimegenomics.com>
Date: Jan 17, 2016, 19:34 UTC
Message-ID: <CAET=KiXJ4tkryy_UNWtD3dRSXXpBfL=7ZS5GNivmGi0Yx7Rv4A@mail.gmail.com>
In-Reply-To: <xmqq4meeflws.fsf@gitster.mtv.corp.google.com>

No my patch doesn't seem to fix this.

Cheers, Dave Ware

(sorry if you're receiving this for the second time, I'm resending since the mailing list blocked my earlier reply for html content)

On Sat, Jan 16, 2016 at 12:44 PM, Junio C Hamano <gitster@pobox.com> wrote:

Show 28 quoted lines

> Marcus Brinkmann <marcus.brinkmann@ruhr-uni-bochum.de> writes:
>
>> I made a simple test repository showing the problem here:
>> https://github.com/lambdafu/git-subtree-split-test
>>
>> After creating the master branch, I created the split/bar branch like this:
>>
>> $ git subtree split -P bar -b split/bar
>>
>> The resulting history is confused by the directory "bar" which was
>> added, removed and then re-added again.  The recent history up to adding
>> the directory the second time is fine.  But then it seems to loose track
>> and add the parent of that commit up to the initial commit in the history.
>>
>> I'd expect that the parent of the readding commit is an empty tree
>> commit (which removed the last files in the directory), and that before
>> that are commits that reflect the initial creation of that directory
>> with its files, but rewritten as a subtree, of course.
>
> Thanks for a report.
>
> David, does this ring a bell?
>
> Dave, does your fix "subtree split" we saw recently on the list
>
>     http://article.gmane.org/gmane.comp.version-control.git/284125
>
> help this?