diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-12-17 00:08:32 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-17 00:08:32 +0300 |
| commit | 71a7de7a99a3199a9ea0660287bd4c1747f4d3b6 (patch) | |
| tree | 1b8efa2809270ee2131954f26f3d6850ed19868d /t/t3400-rebase.sh | |
| parent | c9f5fc91142c26c4a0f69f8eaed35c55e9c591f5 (diff) | |
| parent | cae0bc09abcb12aff79f1aea85d578df7856de4a (diff) | |
Merge branch 'dl/rebase-with-autobase'
"git rebase" did not work well when format.useAutoBase
configuration variable is set, which has been corrected.
* dl/rebase-with-autobase:
rebase: fix format.useAutoBase breakage
format-patch: teach --no-base
t4014: use test_config()
format-patch: fix indentation
t3400: demonstrate failure with format.useAutoBase
Diffstat (limited to 't/t3400-rebase.sh')
| -rwxr-xr-x | t/t3400-rebase.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh index f267f6cd54..221b35f2df 100755 --- a/t/t3400-rebase.sh +++ b/t/t3400-rebase.sh @@ -159,6 +159,12 @@ test_expect_success 'fail when upstream arg is missing and not configured' ' test_must_fail git rebase ' +test_expect_success 'rebase works with format.useAutoBase' ' + test_config format.useAutoBase true && + git checkout topic && + git rebase master +' + test_expect_success 'default to common base in @{upstream}s reflog if no upstream arg' ' git checkout -b default-base master && git checkout -b default topic && |