Merge branch 'jh/notes-fanout-fix'

[thirdparty/git.git] / t / t3400-rebase.sh

diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index f267f6cd549463e023d87a2447b5461b33f79ad7..221b35f2df30846960f74e8cb4d8539f228d6a5f 100755 (executable)
--- 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 &&