Merge branch 'jk/clone-progress-to-stderr' into jc/upload-pack-send-symref
authorJunio C Hamano <gitster@pobox.com>
Tue, 22 Oct 2013 18:38:42 +0000 (11:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Oct 2013 18:38:42 +0000 (11:38 -0700)
* jk/clone-progress-to-stderr:
clone: always set transport options
clone: treat "checking connectivity" like other progress
clone: send diagnostic messages to stderr

1  2 
t/t5601-clone.sh
diff --combined t/t5601-clone.sh
index ccda6dfb4c6931552c4a4baed41fc9ab40bb72c8,b3b11e61c03e5d6d3e49a6f2d4a2281f05a7a600..f8e5a9a4ae1051216e4ef55c8a46c99686e45b5c
@@@ -36,7 -36,7 +36,7 @@@ test_expect_success 'clone with excess 
  
  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
  '
  
@@@ -285,15 -285,4 +285,15 @@@ test_expect_success NOT_MINGW,NOT_CYGWI
        git clone "./foo:bar" foobar
  '
  
 +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