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

diff --combined t/t1404-update-ref-errors.sh
index 2a42a589a42cb9c086561be2df5540fa72af2ddf,372f0b1fbb831a8136e6e1e939416d42a249428d..51a4f4c0ac694ff421e3a17b174697122ecf4b1a
--- 1/t/t1404-update-ref-errors.sh
--- 2/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