diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-03-11 10:58:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-11 10:58:16 -0700 |
| commit | a56d361f66a78cabaf594b611d817a528ad1d489 (patch) | |
| tree | 5c1305fd0a5e3e0c3a2ff462966739189334be2a | |
| parent | Merge branch 'dr/push-remote-ref-update' (diff) | |
| parent | t1091: don't grep for `strerror()` string (diff) | |
| download | tgif-a56d361f66a78cabaf594b611d817a528ad1d489.tar.xz | |
Merge branch 'ds/sparse-add'
Test fix.
* ds/sparse-add:
t1091: don't grep for `strerror()` string
| -rwxr-xr-x | t/t1091-sparse-checkout-builtin.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1091-sparse-checkout-builtin.sh b/t/t1091-sparse-checkout-builtin.sh index b4c9c32a03..44a91205d6 100755 --- a/t/t1091-sparse-checkout-builtin.sh +++ b/t/t1091-sparse-checkout-builtin.sh @@ -305,7 +305,7 @@ test_expect_success 'fail when lock is taken' ' test_when_finished rm -rf repo/.git/info/sparse-checkout.lock && touch repo/.git/info/sparse-checkout.lock && test_must_fail git -C repo sparse-checkout set deep 2>err && - test_i18ngrep "File exists" err + test_i18ngrep "Unable to create .*\.lock" err ' test_expect_success '.gitignore should not warn about cone mode' ' |