summaryrefslogtreecommitdiff
path: root/t/t3200-branch.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-07-18 23:35:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-07-18 23:35:22 (GMT)
commitae46588be0cd730430dded4491246dfb4eac5557 (patch)
tree9805ea1eac01d1b8dbd3f8d7ac84cb2316f22ad4 /t/t3200-branch.sh
parent00a7a21b97a47889cf66de32f8defed023c14c2c (diff)
parentd223e85407f75ffb562b6f7b5f33b6135607977a (diff)
downloadgit-ae46588be0cd730430dded4491246dfb4eac5557.zip
git-ae46588be0cd730430dded4491246dfb4eac5557.tar.gz
git-ae46588be0cd730430dded4491246dfb4eac5557.tar.bz2
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
Diffstat (limited to 't/t3200-branch.sh')
-rwxr-xr-xt/t3200-branch.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index b6aa04b..4c07341 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' '