Re: Odd rebase behavior

From: David A. Greene <greened@obbligato.org>
Date: Dec 18, 2015, 17:43 UTC
Message-ID: <nngmvt73b63.fsf@lnx-dag.us.cray.com>
In-Reply-To: <20151216221716.GD1581@serenity.lan>

John Keeping <john@keeping.me.uk> writes:

> It seems that the problem is introduces by --preserve-merges (and
> -Xsubtree causes something interesting to happen as well).  I see the
> following behaviour:

Thanks for narrowing this down! Is it possible this is actually a cherry-pick problem since --preserve-merges forces rebase to use cherry-pick?

Show 6 quoted lines

> git rebase -Xsubtree=files_subtree --onto files-master master
>
> 	fatal: Could not parse object 'b15c4133fc3146e1330c84159886f0f7a09fbf43^'
> 	Unknown exit code (128) from command: git-merge-recursive
> b15c4133fc3146e1330c84159886f0f7a09fbf43^ -- HEAD
> b15c4133fc3146e1330c84159886f0f7a09fbf43

Ah, good! I had seen this behavior as well but couldn't remember what I did to trigger it.

I don't think I have the expertise to fix rebase and/or cherry-pick. What's the process for adding these tests to the testbase and marking them so the appropriate person can fix them? I see a lot of TODO tests. Should I mark these similarly and propose a patch to the testbase?

                             -David