diff options
| author | Andrei Rybak <rybak.a.v@gmail.com> | 2020-03-22 22:14:22 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-23 00:41:05 +0100 |
| commit | 64d1022e14cafa211f84aab9e1a9f7aab8164855 (patch) | |
| tree | 8f681d1c99a8a9e088fb70cb1ea2bc6f15085cc6 /t/t3417-rebase-whitespace-fix.sh | |
| parent | t9500: remove spaces after redirect operators (diff) | |
| download | git-64d1022e14cafa211f84aab9e1a9f7aab8164855.tar.xz git-64d1022e14cafa211f84aab9e1a9f7aab8164855.zip | |
t: fix whitespace around &&
Add missing spaces before '&&' and switch tabs around '&&' to spaces.
Also fix the space after redirection operator in t3701 while we're here.
These issues were found using `git grep '[^ ]&&$'` and
`git grep -P '&&\t' t/`.
Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3417-rebase-whitespace-fix.sh')
| -rwxr-xr-x | t/t3417-rebase-whitespace-fix.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3417-rebase-whitespace-fix.sh b/t/t3417-rebase-whitespace-fix.sh index e85cdc7037..946e92f8da 100755 --- a/t/t3417-rebase-whitespace-fix.sh +++ b/t/t3417-rebase-whitespace-fix.sh @@ -52,7 +52,7 @@ test_expect_success 'blank line at end of file; extend at end of file' ' git commit --allow-empty -m "Initial empty commit" && git add file && git commit -m first && mv second file && - git add file && git commit -m second && + git add file && git commit -m second && git rebase --whitespace=fix HEAD^^ && git diff --exit-code HEAD^:file expect-first && test_cmp expect-second file @@ -118,7 +118,7 @@ test_expect_success 'at beginning of file' ' for i in 1 2 3 4 5; do echo $i done >> file && - git commit -m more file && + git commit -m more file && git rebase --whitespace=fix HEAD^^ && test_cmp expect-beginning file ' |