[PATCH v4 02/27] apply-one-time-sed.sh: modernize style
- From
Denton Liu <liu.denton@gmail.com>
- Date
- Nov 26, 2019, 01:17 UTC
- Message-ID
- <86f625c65e00b24d1de183c3a993e6acb7c8325e.1574731022.git.liu.denton@gmail.com>
- In-Reply-To
- <cover.1574731022.git.liu.denton@gmail.com>
Convert `[ ... ]` to use `test` and test for the existence of a regular file (`-f`) instead of any file (`-e`).
Move the `then`s onto their own lines so that it conforms with the general test style.
Instead of redirecting input into sed, allow it to open its own input.
Use `cmp -s` instead of `diff` since we only care about whether the two files are equal and `diff` is overkill for this.
Signed-off-by: Denton Liu <liu.denton@gmail.com> --- t/lib-httpd/apply-one-time-sed.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/t/lib-httpd/apply-one-time-sed.sh b/t/lib-httpd/apply-one-time-sed.sh index fcef728925..bf7689d020 100644 --- a/t/lib-httpd/apply-one-time-sed.sh +++ b/t/lib-httpd/apply-one-time-sed.sh @@ -7,11 +7,13 @@ # # This can be used to simulate the effects of the repository changing in # between HTTP request-response pairs. -if [ -e one-time-sed ]; then +if test -f one-time-sed +then "$GIT_EXEC_PATH/git-http-backend" >out - sed "$(cat one-time-sed)" <out >out_modified + sed "$(cat one-time-sed)" out >out_modified - if diff out out_modified >/dev/null; then + if cmp -s out out_modified + then cat out else cat out_modified
-- 2.24.0.504.g3cd56eb17d