From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 5 May 2013 18:12:12 +0000 (-0700)
Subject: Merge branch 'fc/push-with-export-reporting-result'
X-Git-Tag: v1.8.3-rc2~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2be2eb970c14a35a9a0a5a73130ade8c87ab8ff2;p=thirdparty%2Fgit.git

Merge branch 'fc/push-with-export-reporting-result'

* fc/push-with-export-reporting-result:
  transport-helper: improve push messages
---

2be2eb970c14a35a9a0a5a73130ade8c87ab8ff2
diff --cc t/t5801-remote-helpers.sh
index 69212cdde1,214aa40ca4..dbb02e2afd
--- a/t/t5801-remote-helpers.sh
+++ b/t/t5801-remote-helpers.sh
@@@ -167,23 -166,18 +167,37 @@@ test_expect_success 'push ref with exis
  	compare_refs local dup server dup
  '
  
 +test_expect_success GPG 'push signed tag' '
 +	(cd local &&
 +	git checkout master &&
 +	git tag -s -m signed-tag signed-tag &&
 +	git push origin signed-tag
 +	) &&
 +	compare_refs local signed-tag^{} server signed-tag^{} &&
 +	test_must_fail compare_refs local signed-tag server signed-tag
 +'
 +
 +test_expect_success GPG 'push signed tag with signed-tags capability' '
 +	(cd local &&
 +	git checkout master &&
 +	git tag -s -m signed-tag signed-tag-2 &&
 +	GIT_REMOTE_TESTGIT_SIGNED_TAGS=1 git push origin signed-tag-2
 +	) &&
 +	compare_refs local signed-tag-2 server signed-tag-2
 +'
 +
+ test_expect_success 'push messages' '
+ 	(cd local &&
+ 	git checkout -b new_branch master &&
+ 	echo new >>file &&
+ 	git commit -a -m new &&
+ 	git push origin new_branch &&
+ 	git fetch origin &&
+ 	echo new >>file &&
+ 	git commit -a -m new &&
+ 	git push origin new_branch 2> msg &&
+ 	! grep "\[new branch\]" msg
+ 	)
+ '
+ 
  test_done