Merge branch 'maint'

diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh
index c3ffc8f15c6165713e29fecacdd0f335aba1d56c..214756731baf199e6a50f9ab2380a8b4bfc0fb18 100755 (executable)
--- a/t/t5601-clone.sh
+++ b/t/t5601-clone.sh
@@ -161,4 +161,19 @@ test_expect_success 'clone a void' '
        test_cmp target-6/.git/config target-7/.git/config
 '
 
+test_expect_success 'clone respects global branch.autosetuprebase' '
+       (
+               HOME=$(pwd) &&
+               export HOME &&
+               test_config="$HOME/.gitconfig" &&
+               unset GIT_CONFIG_NOGLOBAL &&
+               git config -f "$test_config" branch.autosetuprebase remote &&
+               rm -fr dst &&
+               git clone src dst &&
+               cd dst &&
+               actual="z$(git config branch.master.rebase)" &&
+               test ztrue = $actual
+       )
+'
+
 test_done