Subject: Re: Bug in git rebase --continue in v1.8.4

From: Andriy Gapon <[email-masked]>
Date: Wed, 04 Sep 2013 11:53:12 +0300

on 04/09/2013 11:18 Matthieu Moy said the following:
> [ Cc-ing Ram, as he is the author of the possibly guilty commit. ]
> 
> Andriy Gapon <[email-masked]> writes:
>> Judging by the lack of followups, could this be a FreeBSD-specific problem?
> 
> I can't reproduce here (Debian GNU/Linux). Do the testsuite pass for
> you?
> 
> If not, can you write a failing test? A minimalist script outside the
> testsuite may help too if you're not familiar with Git's testsuite.

Thank you for the suggestion.
I've just tried it and it failed here:

*** t3403-rebase-skip.sh ***
ok 1 - setup
ok 2 - rebase with git am -3 (default)
ok 3 - rebase --skip can not be used with other options
not ok 4 - rebase --skip with am -3
#
#               git rebase --skip
#
not ok 5 - rebase moves back to skip-reference
#
#               test refs/heads/skip-reference = $(git symbolic-ref HEAD) &&
#               git branch post-rebase &&
#               git reset --hard pre-rebase &&
#               test_must_fail git rebase master &&
#               echo "hello" > hello &&
#               git add hello &&
#               git rebase --continue &&
#               test refs/heads/skip-reference = $(git symbolic-ref HEAD) &&
#               git reset --hard post-rebase
#
ok 6 - checkout skip-merge
ok 7 - rebase with --merge
not ok 8 - rebase --skip with --merge
#
#               git rebase --skip
#
ok 9 - merge and reference trees equal
not ok 10 - moved back to branch correctly
#
#               test refs/heads/skip-merge = $(git symbolic-ref HEAD)
#
# failed 4 among 10 test(s)

Christoph has also suggested a small test script in his original email that
started this thread:
http://thread.gmane.org/gmane.comp.version-control.git/233516

-- 
Andriy Gapon