diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-07-19 01:35:22 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-07-19 01:35:22 +0200 |
| commit | ae46588be0cd730430dded4491246dfb4eac5557 (patch) | |
| tree | 9805ea1eac01d1b8dbd3f8d7ac84cb2316f22ad4 | |
| parent | Merge branch 'js/pu-to-seen' into master (diff) | |
| parent | t3200: don't grep for `strerror()` string (diff) | |
| download | git-ae46588be0cd730430dded4491246dfb4eac5557.tar.xz git-ae46588be0cd730430dded4491246dfb4eac5557.zip | |
Merge branch 'dl/branch-cleanup' into master
Last minute fix-up to tests for portability.
* dl/branch-cleanup:
t3200: don't grep for `strerror()` string
| -rwxr-xr-x | t/t3200-branch.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index b6aa04bbec..4c0734157b 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -870,7 +870,7 @@ test_expect_success '--set-upstream-to fails on locked config' ' >.git/config.lock && git branch locked && test_must_fail git branch --set-upstream-to locked 2>err && - test_i18ngrep "could not lock config file .git/config: File exists" err + test_i18ngrep "could not lock config file .git/config" err ' test_expect_success 'use --set-upstream-to modify HEAD' ' @@ -901,7 +901,7 @@ test_expect_success '--unset-upstream should fail if config is locked' ' git branch --set-upstream-to locked && >.git/config.lock && test_must_fail git branch --unset-upstream 2>err && - test_i18ngrep "could not lock config file .git/config: File exists" err + test_i18ngrep "could not lock config file .git/config" err ' test_expect_success 'test --unset-upstream on HEAD' ' |