diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-01-26 15:40:28 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-01-26 15:40:28 -0800 |
| commit | f9219c0b3233229c6686224dfc953e5b3fe92a84 (patch) | |
| tree | dda36de7637de07f35bcdbec4a5ccb41b0821aaa /t | |
| parent | Merge branch 'ep/shell-command-substitution-style' (diff) | |
| parent | completion: add missing branch.*.rebase values (diff) | |
| download | tgif-f9219c0b3233229c6686224dfc953e5b3fe92a84.tar.xz | |
Merge branch 'js/pull-rebase-i'
"git pull --rebase" has been extended to allow invoking
"rebase -i".
* js/pull-rebase-i:
completion: add missing branch.*.rebase values
remote: handle the config setting branch.*.rebase=interactive
pull: allow interactive rebase with --rebase=interactive
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5520-pull.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index a0013ee32f..c952d5ef5c 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -326,6 +326,16 @@ test_expect_success 'pull.rebase=preserve rebases and merges keep-merge' ' test "$(git rev-parse HEAD^2)" = "$(git rev-parse keep-merge)" ' +test_expect_success 'pull.rebase=interactive' ' + write_script "$TRASH_DIRECTORY/fake-editor" <<-\EOF && + echo I was here >fake.out && + false + EOF + test_set_editor "$TRASH_DIRECTORY/fake-editor" && + test_must_fail git pull --rebase=interactive . copy && + test "I was here" = "$(cat fake.out)" +' + test_expect_success 'pull.rebase=invalid fails' ' git reset --hard before-preserve-rebase && test_config pull.rebase invalid && |