undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dl/merge-autostash'

Browse Source 
Test fix.

* dl/merge-autostash:
  t5520: avoid alternation in grep's BRE (not POSIX)
This commit is contained in:
Junio C Hamano 2020-05-24 19:39:37 -07:00
commit 4cf237c0d4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
t/t5520-pull.sh
View File

@ -28,7 +28,7 @@ test_pull_autostash_fail () {
echo dirty >new_file && echo dirty >new_file &&
git add new_file && git add new_file &&
test_must_fail git pull "$@" . copy 2>err && test_must_fail git pull "$@" . copy 2>err &&
test_i18ngrep "\(uncommitted changes.\)\|\(overwritten by merge:\)" err test_i18ngrep -E "uncommitted changes.|overwritten by merge:" err
} }
test_expect_success setup ' test_expect_success setup '