projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 30b5940) | patch
t3407-rebase-abort.sh: Enhance existing tests, and add test for rebase --merge
authorMike Hommey <mh@glandium.org>
Sat, 1 Mar 2008 11:12:13 +0000 (12:12 +0100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 4 Mar 2008 06:13:57 +0000 (22:13 -0800)
commit4947cf9cc377b15006f3e649c59edf9bc813af6f
tree0b7f36f31559f1b5c7c7722bce4eb4675e272bfftree | snapshot
parent30b5940bcd3ed7392795f6a27563013f6f806de4commit | diff
t3407-rebase-abort.sh: Enhance existing tests, and add test for rebase --merge

Removing .dotest should actually not be needed, so just test the directory
don't exist after --abort, but exists after starting the rebase.

Also, execute the same tests with rebase --merge, which uses a different code
path.

Signed-off-by: Mike Hommey <mh@glandium.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t3407-rebase-abort.sh diff | blob | history
Git—the stupid content tracker