From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Sep 2018 20:53:47 +0000 (-0700)
Subject: Merge branch 'sg/t1404-update-ref-test-timeout'
X-Git-Tag: v2.20.0-rc0~255
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ea64414426319b31fe9c2a1aae727c14d36d7d6f?ds=inline;hp=-c

Merge branch 'sg/t1404-update-ref-test-timeout'

An attempt to unflake a test a bit.

* sg/t1404-update-ref-test-timeout:
t1404: increase core.packedRefsTimeout to avoid occasional test failure
---

ea64414426319b31fe9c2a1aae727c14d36d7d6f
diff --combined t/t1404-update-ref-errors.sh
index 2a42a589a4,372f0b1fbb..51a4f4c0ac
--- a/t/t1404-update-ref-errors.sh
+++ b/t/t1404-update-ref-errors.sh
@@@ -27,7 -27,7 +27,7 @@@ test_update_rejected () 
  	fi &&
  	printf "create $prefix/%s $C\n" $create >input &&
  	test_must_fail git update-ref --stdin <input 2>output.err &&
 -	grep -F "$error" output.err &&
 +	test_i18ngrep -F "$error" output.err &&
  	git for-each-ref $prefix >actual &&
  	test_cmp unchanged actual
  }
@@@ -103,7 -103,7 +103,7 @@@ df_test() 
  		printf "%s\n" "delete $delname" "create $addname $D"
  	fi >commands &&
  	test_must_fail git update-ref --stdin <commands 2>output.err &&
 -	test_cmp expected-err output.err &&
 +	test_i18ncmp expected-err output.err &&
  	printf "%s\n" "$C $delref" >expected-refs &&
  	git for-each-ref --format="%(objectname) %(refname)" $prefix/r >actual-refs &&
  	test_cmp expected-refs actual-refs
@@@ -559,9 -559,9 +559,9 @@@ test_expect_success 'no bogus intermedi
  	{
  		# Note: the following command is intentionally run in the
  		# background. We increase the timeout so that `update-ref`
- 		# attempts to acquire the `packed-refs` lock for longer than
- 		# it takes for us to do the check then delete it:
- 		git -c core.packedrefstimeout=3000 update-ref -d $prefix/foo &
+ 		# attempts to acquire the `packed-refs` lock for much longer
+ 		# than it takes for us to do the check then delete it:
+ 		git -c core.packedrefstimeout=30000 update-ref -d $prefix/foo &
  	} &&
  	pid2=$! &&
  	# Give update-ref plenty of time to get to the point where it tries