diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-04-16 13:28:09 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-16 13:28:09 +0300 |
| commit | 4f3036cfa1ffe2470f1afafe541fea8d58d9282b (patch) | |
| tree | dd4302480920e861707b1617f86a0770b7c2330a /t/t3400-rebase.sh | |
| parent | 67e3ec10d0e3a8884660105d1787322acdfc6ee5 (diff) | |
| parent | d03ebd411c651641eab823f0807705f4af65c9b1 (diff) | |
Merge branch 'ab/drop-scripted-rebase'
Retire scripted "git rebase" implementation.
* ab/drop-scripted-rebase:
rebase: remove the rebase.useBuiltin setting
Diffstat (limited to 't/t3400-rebase.sh')
| -rwxr-xr-x | t/t3400-rebase.sh | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh index 460d0523be..42f147858d 100755 --- a/t/t3400-rebase.sh +++ b/t/t3400-rebase.sh @@ -319,4 +319,20 @@ test_expect_success 'rebase--merge.sh and --show-current-patch' ' ) ' +test_expect_success 'rebase -c rebase.useBuiltin=false warning' ' + expected="rebase.useBuiltin support has been removed" && + + # Only warn when the legacy rebase is requested... + test_must_fail git -c rebase.useBuiltin=false rebase 2>err && + test_i18ngrep "$expected" err && + test_must_fail env GIT_TEST_REBASE_USE_BUILTIN=false git rebase 2>err && + test_i18ngrep "$expected" err && + + # ...not when we would have used the built-in anyway + test_must_fail git -c rebase.useBuiltin=true rebase 2>err && + test_must_be_empty err && + test_must_fail env GIT_TEST_REBASE_USE_BUILTIN=true git rebase 2>err && + test_must_be_empty err +' + test_done |