mirror of
https://github.com/git/git.git
synced 2026-03-14 18:59:04 +01:00
Merge branch 'jc/test-allow-sed-with-ere' into jch
* jc/test-allow-sed-with-ere: t: allow use of "sed -E"
This commit is contained in:
@@ -36,7 +36,7 @@ while (<>) {
|
||||
|
||||
$_ = $line;
|
||||
/\bcp\s+-a/ and err 'cp -a is not portable';
|
||||
/\bsed\s+-[^efn]\s+/ and err 'sed option not portable (use only -n, -e, -f)';
|
||||
/\bsed\s+-[^Eefn]\s+/ and err 'sed option not portable (use only -E, -n, -e, -f)';
|
||||
/\becho\s+-[neE]/ and err 'echo with option is not portable (use printf)';
|
||||
/^\s*declare\s+/ and err 'arrays/declare not portable';
|
||||
/^\s*[^#]\s*which\s/ and err 'which is not portable (use type)';
|
||||
|
||||
@@ -402,7 +402,7 @@ test_expect_success 'git bisect run: negative exit code' "
|
||||
git bisect good $HASH1 &&
|
||||
git bisect bad $HASH4 &&
|
||||
! git bisect run ./fail.sh 2>err &&
|
||||
sed -En 's/.*(bisect.*code) (-?[0-9]+) (from.*)/\1 -1 \3/p' err >actual &&
|
||||
sed -E -n 's/.*(bisect.*code) (-?[0-9]+) (from.*)/\1 -1 \3/p' err >actual &&
|
||||
test_cmp expect actual
|
||||
"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user