Merge branch 'sc/doc-howto-dumb-http'

diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh
index a3e3d489ec9db3c3ca0e53ffd2307dd3652c3713..1d1c8755ead4e432744a82f0d7b8ed7dfc8a6510 100755 (executable)
--- a/t/t5601-clone.sh
+++ b/t/t5601-clone.sh
@@ -36,7 +36,7 @@ test_expect_success 'clone with excess parameters (2)' '
 
 test_expect_success C_LOCALE_OUTPUT 'output from clone' '
        rm -fr dst &&
-       git clone -n "file://$(pwd)/src" dst >output &&
+       git clone -n "file://$(pwd)/src" dst >output 2>&1 &&
        test $(grep Clon output | wc -l) = 1
 '
 
@@ -329,4 +329,15 @@ test_expect_success 'bracketed hostnames are still ssh' '
        expect_ssh myhost:123 src
 '
 
+test_expect_success 'clone from a repository with two identical branches' '
+
+       (
+               cd src &&
+               git checkout -b another master
+       ) &&
+       git clone src target-11 &&
+       test "z$( cd target-11 && git symbolic-ref HEAD )" = zrefs/heads/another
+
+'
+
 test_done