diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-07-08 03:02:47 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-08 18:24:19 -0700 |
| commit | 8e4a91bd780b89c7337f281a8601f2e0cae108fc (patch) | |
| tree | c089102c6f0fdaa175ca0a78629aa937f584fdda /t | |
| parent | 3df0a859aa5cc68a2bd616cb686f01cf0e2468c1 (diff) | |
| download | git-8e4a91bd780b89c7337f281a8601f2e0cae108fc.tar.gz git-8e4a91bd780b89c7337f281a8601f2e0cae108fc.tar.xz | |
rebase -i: remember the settings of -v, -s and -p when interrupted
After interruption, be that an edit, or a conflicting commit, reset
the variables VERBOSE, STRATEGY and PRESERVE_MERGES, so that the
user does not have to respecify them with "rebase --continue".
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index c25133699..43a6675ca 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -202,4 +202,14 @@ test_expect_success '--continue tries to commit' ' git show HEAD | grep chouette ' +test_expect_success 'verbose flag is heeded, even after --continue' ' + git reset --hard HEAD@{1} && + test_tick && + ! git rebase -v -i --onto new-branch1 HEAD^ && + echo resolved > file1 && + git add file1 && + git rebase --continue > output && + grep "^ file1 | 2 +-$" output +' + test_done |