From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 21 Nov 2018 13:58:01 +0000 (+0900)
Subject: Merge branch 'ma/t1400-undebug-test' into maint
X-Git-Tag: v2.19.2~21
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6f1c8154aa359884aea6d1eb22c61ea323ebb96f?ds=inline;hp=-c

Merge branch 'ma/t1400-undebug-test' into maint

Test fix.

* ma/t1400-undebug-test:
t1400: drop debug `echo` to actually execute `test`
---

6f1c8154aa359884aea6d1eb22c61ea323ebb96f
diff --combined t/t1400-update-ref.sh
index 02493f14ba,18bf32aa7e..b72beebe42
--- a/t/t1400-update-ref.sh
+++ b/t/t1400-update-ref.sh
@@@ -366,7 -366,7 +366,7 @@@ test_expect_success 'Query master@{2005
  	test_when_finished "rm -f o e" &&
  	git rev-parse --verify master@{2005-05-25} >o 2>e &&
  	test $C = $(cat o) &&
- 	echo test "warning: Log for '\''master'\'' only goes back to $ed." = "$(cat e)"
+ 	test "warning: Log for '\''master'\'' only goes back to $ed." = "$(cat e)"
  '
  test_expect_success 'Query "master@{May 26 2005 23:31:59}" (1 second before history)' '
  	test_when_finished "rm -f o e" &&
@@@ -807,37 -807,6 +807,37 @@@ test_expect_success 'stdin delete symre
  	test_cmp expect actual
  '
  
 +test_expect_success 'stdin update symref works flag --no-deref' '
 +	git symbolic-ref TESTSYMREFONE $b &&
 +	git symbolic-ref TESTSYMREFTWO $b &&
 +	cat >stdin <<-EOF &&
 +	update TESTSYMREFONE $a $b
 +	update TESTSYMREFTWO $a $b
 +	EOF
 +	git update-ref --no-deref --stdin <stdin &&
 +	git rev-parse TESTSYMREFONE TESTSYMREFTWO >expect &&
 +	git rev-parse $a $a >actual &&
 +	test_cmp expect actual &&
 +	git rev-parse $m~1 >expect &&
 +	git rev-parse $b >actual &&
 +	test_cmp expect actual
 +'
 +
 +test_expect_success 'stdin delete symref works flag --no-deref' '
 +	git symbolic-ref TESTSYMREFONE $b &&
 +	git symbolic-ref TESTSYMREFTWO $b &&
 +	cat >stdin <<-EOF &&
 +	delete TESTSYMREFONE $b
 +	delete TESTSYMREFTWO $b
 +	EOF
 +	git update-ref --no-deref --stdin <stdin &&
 +	test_must_fail git rev-parse --verify -q TESTSYMREFONE &&
 +	test_must_fail git rev-parse --verify -q TESTSYMREFTWO &&
 +	git rev-parse $m~1 >expect &&
 +	git rev-parse $b >actual &&
 +	test_cmp expect actual
 +'
 +
  test_expect_success 'stdin delete ref works with right old value' '
  	echo "delete $b $m~1" >stdin &&
  	git update-ref --stdin <stdin &&