diff options
| author |  Denton Liu <liu.denton@gmail.com> | 2019-11-27 11:53:06 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-11-29 13:20:14 -0800 |
| commit | 77a946be98f4cf2947f9aefac924c0ee78a042c7 (patch) | |
| tree | 9ef27ae1523410408bbeb841dfee13c4c84e2aa9 | |
| parent | lib-bash.sh: move `then` onto its own line (diff) | |
| download | tgif-77a946be98f4cf2947f9aefac924c0ee78a042c7.tar.xz | |
apply-one-time-sed.sh: modernize style
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | t/lib-httpd/apply-one-time-sed.sh | 8 |
1 files 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 |