diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-31 12:09:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-31 12:09:08 -0700 |
| commit | df873f96c8132c30d0cbd2b62b726d42d54dc58a (patch) | |
| tree | 71c49410b0e5fedab7b010d6e89f29c2c69645fc /t | |
| parent | 79531569397d88336c147e620fddb1cbf9612d49 (diff) | |
| parent | 53f2ffa80c1c5ea5feb9fbe7432bf7106cf3047e (diff) | |
| download | git-df873f96c8132c30d0cbd2b62b726d42d54dc58a.tar.gz | |
Merge branch 'jk/rebase-head-reflog'
* jk/rebase-head-reflog:
rebase: write a reflog entry when finishing
rebase: create HEAD reflog entry when aborting
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 7d8147bb93..47c8371c7e 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -317,7 +317,7 @@ test_expect_success '--continue tries to commit' ' ' test_expect_success 'verbose flag is heeded, even after --continue' ' - git reset --hard HEAD@{1} && + git reset --hard master@{1} && test_tick && test_must_fail git rebase -v -i --onto new-branch1 HEAD^ && echo resolved > file1 && |