Merge branch 'dl/merge-autostash'

gitster · gitster · commit 4cf237c0d4cc · 2020-05-24T19:39:37.000-07:00
Test fix.

* dl/merge-autostash:
  t5520: avoid alternation in grep's BRE (not POSIX)
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
@@ -28,7 +28,7 @@ test_pull_autostash_fail () {
 	echo dirty >new_file &&
 	git add new_file &&
 	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 '

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ test_pull_autostash_fail () {`
`28`	`28`	`echo dirty >new_file &&`
`29`	`29`	`git add new_file &&`
`30`	`30`	`test_must_fail git pull "$@" . copy 2>err &&`
`31`		`- test_i18ngrep "\(uncommitted changes.\)\\|\(overwritten by merge:\)" err`
	`31`	`+ test_i18ngrep -E "uncommitted changes.\|overwritten by merge:" err`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`test_expect_success setup '`