On Mon, Apr 16, 2012 at 11:02 AM, Linus Torvalds
<torvalds@xxxxxxxxxxxxxxxxxxxx> wrote:
>
> Oddly, running that test in verbose mode seems to imply that it's the
> *rebase* that succeeds, not the merges in that test. Maybe I'm reading
> the test results wrong, I didn't really try to understand the test
> itself ;(
Yes, it's the rebase that succeeds. "git log -g" in the trash
directory shows that we ended up successfully rebasing J2:
commit 5fc34ec1a8ed96664198fefc74121cd052b10861
Reflog: HEAD@{1} (C O Mitter <committer@xxxxxxxxxxx>)
Reflog message: rebase -i (pick): Merge made by the 'recursive' strategy.
Author: A U Thor <author@xxxxxxxxxxx>
Date: Thu Apr 7 15:28:13 2005 -0700
J2
while a successful test will fail that.
However, I don't actually see what changed.
Oh - one thing to note is that the *patch* of that successful rebase
is empty. That may be the big clue: we successfully finish the merge
without noticing that it didn't change any state, and we should have
failed it as an empty commit. Hmm?
Linus
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html