From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 22 Oct 2013 18:38:42 +0000 (-0700)
Subject: Merge branch 'jk/clone-progress-to-stderr' into jc/upload-pack-send-symref
X-Git-Tag: v1.8.4.3~3^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c4125fccb4c310b440ef6b0d4ed3c8cb651e1afa?ds=inline;hp=-c

Merge branch 'jk/clone-progress-to-stderr' into jc/upload-pack-send-symref

* jk/clone-progress-to-stderr:
clone: always set transport options
clone: treat "checking connectivity" like other progress
clone: send diagnostic messages to stderr
---

c4125fccb4c310b440ef6b0d4ed3c8cb651e1afa
diff --combined t/t5601-clone.sh
index ccda6dfb4c,b3b11e61c0..f8e5a9a4ae
--- a/t/t5601-clone.sh
+++ b/t/t5601-clone.sh
@@@ -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