From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 7 Jul 2017 01:14:46 +0000 (-0700)
Subject: Merge branch 'js/t5534-rev-parse-gives-multi-line-output-fix'
X-Git-Tag: v2.14.0-rc0~27
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ccce1e51e8cbc39e944302c2e34f15ef5cb39fce?ds=inline;hp=-c

Merge branch 'js/t5534-rev-parse-gives-multi-line-output-fix'

A few tests that tried to verify the contents of push certificates
did not use 'git rev-parse' to formulate the line to look for in
the certificate correctly.

* js/t5534-rev-parse-gives-multi-line-output-fix:
t5534: fix misleading grep invocation
---

ccce1e51e8cbc39e944302c2e34f15ef5cb39fce
diff --combined t/t5534-push-signed.sh
index 5bcb288f5c,2db0c3389c..464ffdd147
--- a/t/t5534-push-signed.sh
+++ b/t/t5534-push-signed.sh
@@@ -119,48 -119,14 +119,51 @@@ test_expect_success GPG 'signed push se
  		sed -n -e "s/^nonce /NONCE=/p" -e "/^$/q" dst/push-cert
  	) >expect &&
  
- 	grep "$(git rev-parse noop ff) refs/heads/ff" dst/push-cert &&
- 	grep "$(git rev-parse noop noff) refs/heads/noff" dst/push-cert &&
+ 	noop=$(git rev-parse noop) &&
+ 	ff=$(git rev-parse ff) &&
+ 	noff=$(git rev-parse noff) &&
+ 	grep "$noop $ff refs/heads/ff" dst/push-cert &&
+ 	grep "$noop $noff refs/heads/noff" dst/push-cert &&
  	test_cmp expect dst/push-cert-status
  '
  
 +test_expect_success GPG 'inconsistent push options in signed push not allowed' '
 +	# First, invoke receive-pack with dummy input to obtain its preamble.
 +	prepare_dst &&
 +	git -C dst config receive.certnonceseed sekrit &&
 +	git -C dst config receive.advertisepushoptions 1 &&
 +	printf xxxx | test_might_fail git receive-pack dst >preamble &&
 +
 +	# Then, invoke push. Simulate a receive-pack that sends the preamble we
 +	# obtained, followed by a dummy packet.
 +	write_script myscript <<-\EOF &&
 +		cat preamble &&
 +		printf xxxx &&
 +		cat >push
 +	EOF
 +	test_might_fail git push --push-option="foo" --push-option="bar" \
 +		--receive-pack="\"$(pwd)/myscript\"" --signed dst --delete ff &&
 +
 +	# Replay the push output on a fresh dst, checking that ff is truly
 +	# deleted.
 +	prepare_dst &&
 +	git -C dst config receive.certnonceseed sekrit &&
 +	git -C dst config receive.advertisepushoptions 1 &&
 +	git receive-pack dst <push &&
 +	test_must_fail git -C dst rev-parse ff &&
 +
 +	# Tweak the push output to make the push option outside the cert
 +	# different, then replay it on a fresh dst, checking that ff is not
 +	# deleted.
 +	perl -pe "s/([^ ])bar/\$1baz/" push >push.tweak &&
 +	prepare_dst &&
 +	git -C dst config receive.certnonceseed sekrit &&
 +	git -C dst config receive.advertisepushoptions 1 &&
 +	git receive-pack dst <push.tweak >out &&
 +	git -C dst rev-parse ff &&
 +	grep "inconsistent push options" out
 +'
 +
  test_expect_success GPG 'fail without key and heed user.signingkey' '
  	prepare_dst &&
  	mkdir -p dst/.git/hooks &&
@@@ -200,8 -166,11 +203,11 @@@
  		sed -n -e "s/^nonce /NONCE=/p" -e "/^$/q" dst/push-cert
  	) >expect &&
  
- 	grep "$(git rev-parse noop ff) refs/heads/ff" dst/push-cert &&
- 	grep "$(git rev-parse noop noff) refs/heads/noff" dst/push-cert &&
+ 	noop=$(git rev-parse noop) &&
+ 	ff=$(git rev-parse ff) &&
+ 	noff=$(git rev-parse noff) &&
+ 	grep "$noop $ff refs/heads/ff" dst/push-cert &&
+ 	grep "$noop $noff refs/heads/noff" dst/push-cert &&
  	test_cmp expect dst/push-cert-status
  '