mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-12 18:46:09 +02:00
Code

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
This commit is contained in:
Junio C Hamano 2020-07-18 16:35:22 -07:00
parent 00a7a21b97 d223e85407
commit ae46588be0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
t/t3200-branch.sh
View File

@ -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' '