diff options
author | Andrei Rybak <rybak.a.v@gmail.com> | 2020-03-22 21:14:22 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-03-22 23:41:05 (GMT) |
commit | 64d1022e14cafa211f84aab9e1a9f7aab8164855 (patch) | |
tree | 8f681d1c99a8a9e088fb70cb1ea2bc6f15085cc6 /t/t7609-merge-co-error-msgs.sh | |
parent | 9b966fffc26d378cc11bd3e924f979403ab174dc (diff) | |
download | git-64d1022e14cafa211f84aab9e1a9f7aab8164855.zip git-64d1022e14cafa211f84aab9e1a9f7aab8164855.tar.gz git-64d1022e14cafa211f84aab9e1a9f7aab8164855.tar.bz2 |
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/t7609-merge-co-error-msgs.sh')
-rwxr-xr-x | t/t7609-merge-co-error-msgs.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7609-merge-co-error-msgs.sh b/t/t7609-merge-co-error-msgs.sh index e904132..5c8894d 100755 --- a/t/t7609-merge-co-error-msgs.sh +++ b/t/t7609-merge-co-error-msgs.sh @@ -126,7 +126,7 @@ test_expect_success 'not_uptodate_dir porcelain checkout error' ' git rm rep2 -r && >rep && >rep2 && - git add rep rep2&& + git add rep rep2 && git commit -m "added test as a file" && git checkout master && >rep/untracked-file && |