Merge branch 'tb/test-lint-sed-options'

gitster · gitster · commit d8d62e61353c · 2019-02-06T22:05:24.000-08:00
The test lint learned to catch non-portable "sed" options.

* tb/test-lint-sed-options:
  test-lint: only use only sed [-n] [-e command] [-f command_file]
diff --git a/t/check-non-portable-shell.pl b/t/check-non-portable-shell.pl
@@ -36,7 +36,7 @@ sub err {
 	}
 
 	/\bcp\s+-a/ and err 'cp -a is not portable';
-	/\bsed\s+-i/ and err 'sed -i is not portable';
+	/\bsed\s+-[^efn]\s+/ and err 'sed option not portable (use only -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)';

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ sub err {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`/\bcp\s+-a/ and err 'cp -a is not portable';`
`39`		`- /\bsed\s+-i/ and err 'sed -i is not portable';`
	`39`	`+ /\bsed\s+-[^efn]\s+/ and err 'sed option not portable (use only -n, -e, -f)';`
`40`	`40`	`/\becho\s+-[neE]/ and err 'echo with option is not portable (use printf)';`
`41`	`41`	`/^\s*declare\s+/ and err 'arrays/declare not portable';`
`42`	`42`	`/^\s[^#]\swhich\s/ and err 'which is not portable (use type)';`