diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-06-25 18:56:55 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-06-26 18:58:45 -0700 |
| commit | c54b7817f4f6bf422ea532d81217c28f63c259c5 (patch) | |
| tree | fac8ec8c43606f72e921f2560abe3d4cce222e68 /t/t3404-rebase-interactive.sh | |
| parent | ad562a817256adff4faadc17900b4aba67ca471a (diff) | |
| download | git-c54b7817f4f6bf422ea532d81217c28f63c259c5.tar.gz git-c54b7817f4f6bf422ea532d81217c28f63c259c5.tar.xz | |
rebase -i: several cleanups
Support "--verbose" in addition to "-v", show short names in the list
comment, clean up if there is nothing to do, and add several "test_ticks"
in the test script.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3404-rebase-interactive.sh')
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 48aa8ea81..19a3a8e81 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -140,6 +140,7 @@ test_expect_success 'abort' ' test_expect_success 'retain authorship' ' echo A > file7 && git add file7 && + test_tick && GIT_AUTHOR_NAME="Twerp Snog" git commit -m "different author" && git tag twerp && git rebase -i --onto master HEAD^ && @@ -149,6 +150,7 @@ test_expect_success 'retain authorship' ' test_expect_success 'squash' ' git reset --hard twerp && echo B > file7 && + test_tick && GIT_AUTHOR_NAME="Nitfol" git commit -m "nitfol" file7 && echo "******************************" && FAKE_LINES="1 squash 2" git rebase -i --onto master HEAD~2 && |