* [PATCH] t: fix whitespace around &&
@ 2020-03-15 18:09 Andrei Rybak
2020-03-15 18:20 ` Eric Sunshine
2020-03-22 21:14 ` [PATCH v2 1/2] t9500: remove spaces after redirect operators Andrei Rybak
0 siblings, 2 replies; 10+ messages in thread
From: Andrei Rybak @ 2020-03-15 18:09 UTC (permalink / raw)
To: git; +Cc: Andrei Rybak
Add missing spaces before '&&' and switch tabs to spaces. Also fix the
space after redirection operator in t3701-add-interactive.sh while we're
here. These issues were found using `git grep '[^ ]&&$'`.
Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com>
---
t/t2402-worktree-list.sh | 2 +-
t/t3417-rebase-whitespace-fix.sh | 2 +-
t/t3700-add.sh | 2 +-
t/t3701-add-interactive.sh | 2 +-
t/t4057-diff-combined-paths.sh | 2 +-
t/t4150-am.sh | 2 +-
t/t5537-fetch-shallow.sh | 2 +-
t/t7400-submodule-basic.sh | 4 ++--
t/t7609-merge-co-error-msgs.sh | 2 +-
t/t9010-svn-fe.sh | 2 +-
t/t9500-gitweb-standalone-no-errors.sh | 4 ++--
t/t9831-git-p4-triggers.sh | 2 +-
12 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/t/t2402-worktree-list.sh b/t/t2402-worktree-list.sh
index 69ffe865b4..52585ec2aa 100755
--- a/t/t2402-worktree-list.sh
+++ b/t/t2402-worktree-list.sh
@@ -152,7 +152,7 @@ test_expect_success 'linked worktrees are sorted' '
'
test_expect_success 'worktree path when called in .git directory' '
- git worktree list >list1&&
+ git worktree list >list1 &&
git -C .git worktree list >list2 &&
test_cmp list1 list2
'
diff --git a/t/t3417-rebase-whitespace-fix.sh b/t/t3417-rebase-whitespace-fix.sh
index e85cdc7037..14df183fa5 100755
--- a/t/t3417-rebase-whitespace-fix.sh
+++ b/t/t3417-rebase-whitespace-fix.sh
@@ -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
'
diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index 88bc799807..b7d4ba608c 100755
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -192,7 +192,7 @@ test_expect_success 'git add --refresh with pathspec' '
test_must_be_empty actual &&
git diff-files --name-only >actual &&
- ! grep bar actual&&
+ ! grep bar actual &&
grep baz actual
'
diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
index 5bae6e50f1..b3d8bb7577 100755
--- a/t/t3701-add-interactive.sh
+++ b/t/t3701-add-interactive.sh
@@ -780,7 +780,7 @@ test_expect_success 'add -p patch editing works with pathological context lines'
test_expect_success 'checkout -p works with pathological context lines' '
test_write_lines a a a a a a >a &&
git add a &&
- test_write_lines a b a b a b a b a b a > a&&
+ test_write_lines a b a b a b a b a b a >a &&
test_write_lines s n n y q | git checkout -p &&
test_write_lines a b a b a a b a b a >expect &&
test_cmp expect a
diff --git a/t/t4057-diff-combined-paths.sh b/t/t4057-diff-combined-paths.sh
index 4f4b541658..0b78573733 100755
--- a/t/t4057-diff-combined-paths.sh
+++ b/t/t4057-diff-combined-paths.sh
@@ -14,7 +14,7 @@ diffc_verify () {
test_expect_success 'trivial merge - combine-diff empty' '
for i in $(test_seq 1 9)
do
- echo $i >$i.txt &&
+ echo $i >$i.txt &&
git add $i.txt
done &&
git commit -m "init" &&
diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index cb45271457..bda4586a79 100755
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -166,7 +166,7 @@ test_expect_success setup '
test_tick &&
git commit -m third &&
- git format-patch --stdout first >patch2 &&
+ git format-patch --stdout first >patch2 &&
git checkout -b lorem &&
sed -n -e "11,\$p" msg >file &&
diff --git a/t/t5537-fetch-shallow.sh b/t/t5537-fetch-shallow.sh
index 4f681dbbe1..b57209c84f 100755
--- a/t/t5537-fetch-shallow.sh
+++ b/t/t5537-fetch-shallow.sh
@@ -131,7 +131,7 @@ test_expect_success 'fetch that requires changes in .git/shallow is filtered' '
git init notshallow &&
(
cd notshallow &&
- git fetch ../shallow/.git refs/heads/*:refs/remotes/shallow/*&&
+ git fetch ../shallow/.git refs/heads/*:refs/remotes/shallow/* &&
git for-each-ref --format="%(refname)" >actual.refs &&
cat <<EOF >expect.refs &&
refs/remotes/shallow/no-shallow
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index e3e2aab3b0..956e17abb3 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -938,7 +938,7 @@ test_expect_success 'submodule add --name allows to replace a submodule with ano
echo "repo" >expect &&
test_must_fail git config -f .gitmodules submodule.repo.path &&
git config -f .gitmodules submodule.repo_new.path >actual &&
- test_cmp expect actual&&
+ test_cmp expect actual &&
echo "$submodurl/repo" >expect &&
test_must_fail git config -f .gitmodules submodule.repo.url &&
echo "$submodurl/bare.git" >expect &&
@@ -1010,7 +1010,7 @@ test_expect_success 'submodule add with an existing name fails unless forced' '
test -d repo &&
echo "repo" >expect &&
git config -f .gitmodules submodule.repo_new.path >actual &&
- test_cmp expect actual&&
+ test_cmp expect actual &&
echo "$submodurl/repo.git" >expect &&
git config -f .gitmodules submodule.repo_new.url >actual &&
test_cmp expect actual &&
diff --git a/t/t7609-merge-co-error-msgs.sh b/t/t7609-merge-co-error-msgs.sh
index e90413204e..5c8894d94f 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 &&
diff --git a/t/t9010-svn-fe.sh b/t/t9010-svn-fe.sh
index c90fdc5c89..83f8f5cacb 100755
--- a/t/t9010-svn-fe.sh
+++ b/t/t9010-svn-fe.sh
@@ -486,7 +486,7 @@ test_expect_success 'NUL in property value' '
{
properties \
unimportant "something with a NUL (Q)" \
- svn:log "commit message"&&
+ svn:log "commit message" &&
echo PROPS-END
} |
q_to_nul >props &&
diff --git a/t/t9500-gitweb-standalone-no-errors.sh b/t/t9500-gitweb-standalone-no-errors.sh
index cc8d463e01..a3cbf20ae7 100755
--- a/t/t9500-gitweb-standalone-no-errors.sh
+++ b/t/t9500-gitweb-standalone-no-errors.sh
@@ -348,7 +348,7 @@ test_expect_success \
echo "To be renamed and changed" > 04-rename-from &&
echo "To have mode changed" > 05-mode-change &&
echo "File to symlink" > 06-file-or-symlink &&
- echo "To be changed and have mode changed" > 07-change-mode-change &&
+ echo "To be changed and have mode changed" > 07-change-mode-change &&
git add 0* &&
git commit -a -m "Prepare large commit" &&
echo "Changed" > 01-change &&
@@ -361,7 +361,7 @@ test_expect_success \
test_chmod +x 05-mode-change &&
rm -f 06-file-or-symlink &&
test_ln_s_add 01-change 06-file-or-symlink &&
- echo "Changed and have mode changed" > 07-change-mode-change &&
+ echo "Changed and have mode changed" > 07-change-mode-change &&
test_chmod +x 07-change-mode-change &&
git commit -a -m "Large commit" &&
git checkout master'
diff --git a/t/t9831-git-p4-triggers.sh b/t/t9831-git-p4-triggers.sh
index d743ca33ee..ff6c0352e6 100755
--- a/t/t9831-git-p4-triggers.sh
+++ b/t/t9831-git-p4-triggers.sh
@@ -58,7 +58,7 @@ test_expect_success 'import with extra info lines from verbose p4 trigger' '
(
cd "$git" &&
git p4 sync
- )&&
+ ) &&
(
p4 triggers -i <<-EOF
Triggers:
--
2.25.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH] t: fix whitespace around &&
2020-03-15 18:09 [PATCH] t: fix whitespace around && Andrei Rybak
@ 2020-03-15 18:20 ` Eric Sunshine
2020-03-15 18:35 ` Andrei Rybak
2020-03-22 21:14 ` [PATCH v2 1/2] t9500: remove spaces after redirect operators Andrei Rybak
1 sibling, 1 reply; 10+ messages in thread
From: Eric Sunshine @ 2020-03-15 18:20 UTC (permalink / raw)
To: Andrei Rybak; +Cc: Git List
On Sun, Mar 15, 2020 at 2:09 PM Andrei Rybak <rybak.a.v@gmail.com> wrote:
> Add missing spaces before '&&' and switch tabs to spaces. Also fix the
> space after redirection operator in t3701-add-interactive.sh while we're
> here. These issues were found using `git grep '[^ ]&&$'`.
>
> Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com>
> ---
> diff --git a/t/t9500-gitweb-standalone-no-errors.sh b/t/t9500-gitweb-standalone-no-errors.sh
> @@ -348,7 +348,7 @@ test_expect_success \
> - echo "To be changed and have mode changed" > 07-change-mode-change &&
> + echo "To be changed and have mode changed" > 07-change-mode-change &&
The commit message talks about dropping whitespace after the '>'
redirection operator (and some of the changes in this patch do so),
however, this change neglects that cleanup.
> @@ -361,7 +361,7 @@ test_expect_success \
> - echo "Changed and have mode changed" > 07-change-mode-change &&
> + echo "Changed and have mode changed" > 07-change-mode-change &&
Ditto.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] t: fix whitespace around &&
2020-03-15 18:20 ` Eric Sunshine
@ 2020-03-15 18:35 ` Andrei Rybak
2020-03-15 18:38 ` Eric Sunshine
0 siblings, 1 reply; 10+ messages in thread
From: Andrei Rybak @ 2020-03-15 18:35 UTC (permalink / raw)
To: Eric Sunshine; +Cc: Git List
On 2020-03-15 19:20, Eric Sunshine wrote:
> On Sun, Mar 15, 2020 at 2:09 PM Andrei Rybak <rybak.a.v@gmail.com> wrote:
>> Add missing spaces before '&&' and switch tabs to spaces. Also fix the
>> space after redirection operator in t3701-add-interactive.sh while we're
>> here. These issues were found using `git grep '[^ ]&&$'`.
>>
>> Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com>
>> ---
>> diff --git a/t/t9500-gitweb-standalone-no-errors.sh b/t/t9500-gitweb-standalone-no-errors.sh
>> @@ -348,7 +348,7 @@ test_expect_success \
>> - echo "To be changed and have mode changed" > 07-change-mode-change &&
>> + echo "To be changed and have mode changed" > 07-change-mode-change &&
>
> The commit message talks about dropping whitespace after the '>'
> redirection operator (and some of the changes in this patch do so),
> however, this change neglects that cleanup.
Good catch. t9500-gitweb-standalone-no-errors.sh has 35 of these vs 19
redirects with correct formatting, so it might be better to fix those redirects
in a separate patch. What do you think?
>> @@ -361,7 +361,7 @@ test_expect_success \
>> - echo "Changed and have mode changed" > 07-change-mode-change &&
>> + echo "Changed and have mode changed" > 07-change-mode-change &&
>
> Ditto.
>
Thanks for review.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] t: fix whitespace around &&
2020-03-15 18:35 ` Andrei Rybak
@ 2020-03-15 18:38 ` Eric Sunshine
0 siblings, 0 replies; 10+ messages in thread
From: Eric Sunshine @ 2020-03-15 18:38 UTC (permalink / raw)
To: Andrei Rybak; +Cc: Git List
On Sun, Mar 15, 2020 at 2:35 PM Andrei Rybak <rybak.a.v@gmail.com> wrote:
> On 2020-03-15 19:20, Eric Sunshine wrote:
> > On Sun, Mar 15, 2020 at 2:09 PM Andrei Rybak <rybak.a.v@gmail.com> wrote:
> >> - echo "To be changed and have mode changed" > 07-change-mode-change &&
> >> + echo "To be changed and have mode changed" > 07-change-mode-change &&
> >
> > The commit message talks about dropping whitespace after the '>'
> > redirection operator (and some of the changes in this patch do so),
> > however, this change neglects that cleanup.
>
> Good catch. t9500-gitweb-standalone-no-errors.sh has 35 of these vs 19
> redirects with correct formatting, so it might be better to fix those redirects
> in a separate patch. What do you think?
Yes, fixing it in a separate patch makes sense.
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2 1/2] t9500: remove spaces after redirect operators
2020-03-15 18:09 [PATCH] t: fix whitespace around && Andrei Rybak
2020-03-15 18:20 ` Eric Sunshine
@ 2020-03-22 21:14 ` Andrei Rybak
2020-03-22 21:14 ` [PATCH v2 2/2] t: fix whitespace around && Andrei Rybak
1 sibling, 1 reply; 10+ messages in thread
From: Andrei Rybak @ 2020-03-22 21:14 UTC (permalink / raw)
To: git, sunshine; +Cc: Andrei Rybak
For shell scripts, the usual convention is for there to be no space
after redirection operators, (e.g. `>file`, not `> file`). Remove these
spaces wherever they appear.
Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com>
---
A new patch from review by Eric Sunshine.
t/t9500-gitweb-standalone-no-errors.sh | 70 +++++++++++++-------------
1 file changed, 35 insertions(+), 35 deletions(-)
diff --git a/t/t9500-gitweb-standalone-no-errors.sh b/t/t9500-gitweb-standalone-no-errors.sh
index cc8d463e01..784df80858 100755
--- a/t/t9500-gitweb-standalone-no-errors.sh
+++ b/t/t9500-gitweb-standalone-no-errors.sh
@@ -53,7 +53,7 @@ test_expect_success \
test_expect_success \
'Make initial commit' \
- 'echo "Not an empty file." > file &&
+ 'echo "Not an empty file." >file &&
git add file &&
git commit -a -m "Initial commit." &&
git branch b'
@@ -139,7 +139,7 @@ test_expect_success \
test_expect_success \
'commitdiff(0): file added' \
- 'echo "New file" > new_file &&
+ 'echo "New file" >new_file &&
git add new_file &&
git commit -a -m "File added." &&
gitweb_run "p=.git;a=commitdiff"'
@@ -179,7 +179,7 @@ test_expect_success \
test_expect_success \
'commitdiff(0): mode change and modified' \
- 'echo "New line" >> file2 &&
+ 'echo "New line" >>file2 &&
test_chmod +x file2 &&
git commit -a -m "Mode change and modification." &&
gitweb_run "p=.git;a=commitdiff"'
@@ -197,14 +197,14 @@ propter nomen suum.
EOF
git commit -a -m "File added." &&
git mv file2 file3 &&
- echo "Propter nomen suum." >> file3 &&
+ echo "Propter nomen suum." >>file3 &&
git commit -a -m "File rename and modification." &&
gitweb_run "p=.git;a=commitdiff"'
test_expect_success \
'commitdiff(0): renamed, mode change and modified' \
'git mv file3 file2 &&
- echo "Propter nomen suum." >> file2 &&
+ echo "Propter nomen suum." >>file2 &&
test_chmod +x file2 &&
git commit -a -m "File rename, mode change and modification." &&
gitweb_run "p=.git;a=commitdiff"'
@@ -213,8 +213,8 @@ test_expect_success \
# commitdiff testing (taken from t4114-apply-typechange.sh)
test_expect_success 'setup typechange commits' '
- echo "hello world" > foo &&
- echo "hi planet" > bar &&
+ echo "hello world" >foo &&
+ echo "hi planet" >bar &&
git update-index --add foo bar &&
git commit -m initial &&
git branch initial &&
@@ -223,18 +223,18 @@ test_expect_success 'setup typechange commits' '
git commit -m "foo symlinked to bar" &&
git branch foo-symlinked-to-bar &&
rm -f foo &&
- echo "how far is the sun?" > foo &&
+ echo "how far is the sun?" >foo &&
git update-index foo &&
git commit -m "foo back to file" &&
git branch foo-back-to-file &&
rm -f foo &&
git update-index --remove foo &&
mkdir foo &&
- echo "if only I knew" > foo/baz &&
+ echo "if only I knew" >foo/baz &&
git update-index --add foo/baz &&
git commit -m "foo becomes a directory" &&
git branch "foo-becomes-a-directory" &&
- echo "hello world" > foo/baz &&
+ echo "hello world" >foo/baz &&
git update-index foo/baz &&
git commit -m "foo/baz is the original foo" &&
git branch foo-baz-renamed-from-foo
@@ -324,7 +324,7 @@ test_expect_success 'commitdiff(1): removal of incomplete line' '
test_expect_success \
'Create a merge' \
'git checkout b &&
- echo "Branch" >> b &&
+ echo "Branch" >>b &&
git add b &&
git commit -a -m "On branch" &&
git checkout master &&
@@ -342,26 +342,26 @@ test_expect_success \
test_expect_success \
'Prepare large commit' \
'git checkout b &&
- echo "To be changed" > 01-change &&
- echo "To be renamed" > 02-pure-rename-from &&
- echo "To be deleted" > 03-delete &&
- echo "To be renamed and changed" > 04-rename-from &&
- echo "To have mode changed" > 05-mode-change &&
- echo "File to symlink" > 06-file-or-symlink &&
- echo "To be changed and have mode changed" > 07-change-mode-change &&
+ echo "To be changed" >01-change &&
+ echo "To be renamed" >02-pure-rename-from &&
+ echo "To be deleted" >03-delete &&
+ echo "To be renamed and changed" >04-rename-from &&
+ echo "To have mode changed" >05-mode-change &&
+ echo "File to symlink" >06-file-or-symlink &&
+ echo "To be changed and have mode changed" >07-change-mode-change &&
git add 0* &&
git commit -a -m "Prepare large commit" &&
- echo "Changed" > 01-change &&
+ echo "Changed" >01-change &&
git mv 02-pure-rename-from 02-pure-rename-to &&
git rm 03-delete && rm -f 03-delete &&
- echo "A new file" > 03-new &&
+ echo "A new file" >03-new &&
git add 03-new &&
git mv 04-rename-from 04-rename-to &&
- echo "Changed" >> 04-rename-to &&
+ echo "Changed" >>04-rename-to &&
test_chmod +x 05-mode-change &&
rm -f 06-file-or-symlink &&
test_ln_s_add 01-change 06-file-or-symlink &&
- echo "Changed and have mode changed" > 07-change-mode-change &&
+ echo "Changed and have mode changed" >07-change-mode-change &&
test_chmod +x 07-change-mode-change &&
git commit -a -m "Large commit" &&
git checkout master'
@@ -444,7 +444,7 @@ test_expect_success \
test_expect_success \
'logs: history (implicit HEAD, deleted file)' \
'git checkout master &&
- echo "to be deleted" > deleted_file &&
+ echo "to be deleted" >deleted_file &&
git add deleted_file &&
git commit -m "Add file to be deleted" &&
git rm deleted_file &&
@@ -522,7 +522,7 @@ test_expect_success \
'. "$TEST_DIRECTORY"/t3901/utf8.txt &&
test_when_finished "GIT_AUTHOR_NAME=\"A U Thor\"" &&
test_when_finished "GIT_COMMITTER_NAME=\"C O Mitter\"" &&
- echo "UTF-8" >> file &&
+ echo "UTF-8" >>file &&
git add file &&
git commit -F "$TEST_DIRECTORY"/t3900/1-UTF-8.txt &&
gitweb_run "p=.git;a=commit"'
@@ -532,7 +532,7 @@ test_expect_success \
'. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
test_when_finished "GIT_AUTHOR_NAME=\"A U Thor\"" &&
test_when_finished "GIT_COMMITTER_NAME=\"C O Mitter\"" &&
- echo "ISO-8859-1" >> file &&
+ echo "ISO-8859-1" >>file &&
git add file &&
test_config i18n.commitencoding ISO-8859-1 &&
git commit -F "$TEST_DIRECTORY"/t3900/ISO8859-1.txt &&
@@ -675,8 +675,8 @@ test_expect_success \
test_expect_success \
'README.html with non-ASCII characters (utf-8)' \
- 'echo "<b>UTF-8 example:</b><br />" > .git/README.html &&
- cat "$TEST_DIRECTORY"/t3900/1-UTF-8.txt >> .git/README.html &&
+ 'echo "<b>UTF-8 example:</b><br />" >.git/README.html &&
+ cat "$TEST_DIRECTORY"/t3900/1-UTF-8.txt >>.git/README.html &&
gitweb_run "p=.git;a=summary"'
# ----------------------------------------------------------------------
@@ -704,7 +704,7 @@ test_expect_success HIGHLIGHT \
test_expect_success HIGHLIGHT \
'syntax highlighting (highlighted, shell script)' \
'git config gitweb.highlight yes &&
- echo "#!/usr/bin/sh" > test.sh &&
+ echo "#!/usr/bin/sh" >test.sh &&
git add test.sh &&
git commit -m "Add test.sh" &&
gitweb_run "p=.git;a=blob;f=test.sh"'
@@ -712,7 +712,7 @@ test_expect_success HIGHLIGHT \
test_expect_success HIGHLIGHT \
'syntax highlighting (highlighter language autodetection)' \
'git config gitweb.highlight yes &&
- echo "#!/usr/bin/perl" > test &&
+ echo "#!/usr/bin/perl" >test &&
git add test &&
git commit -m "Add test" &&
gitweb_run "p=.git;a=blob;f=test"'
@@ -729,11 +729,11 @@ test_expect_success \
'git init --bare foo.git &&
git --git-dir=foo.git --work-tree=. add file &&
git --git-dir=foo.git --work-tree=. commit -m "Initial commit" &&
- echo "foo" > foo.git/description &&
+ echo "foo" >foo.git/description &&
mkdir -p foo &&
(cd foo &&
git clone --shared --bare ../foo.git foo-forked.git &&
- echo "fork of foo" > foo-forked.git/description)'
+ echo "fork of foo" >foo-forked.git/description)'
test_expect_success \
'forks: projects list' \
@@ -754,8 +754,8 @@ EOF
test_expect_success \
'ctags: tag cloud in projects list' \
'mkdir .git/ctags &&
- echo "2" > .git/ctags/foo &&
- echo "1" > .git/ctags/bar &&
+ echo "2" >.git/ctags/foo &&
+ echo "1" >.git/ctags/bar &&
gitweb_run'
test_expect_success \
@@ -769,8 +769,8 @@ test_expect_success \
test_expect_success \
'ctags: malformed tag weights' \
'mkdir -p .git/ctags &&
- echo "not-a-number" > .git/ctags/nan &&
- echo "not-a-number-2" > .git/ctags/nan2 &&
+ echo "not-a-number" >.git/ctags/nan &&
+ echo "not-a-number-2" >.git/ctags/nan2 &&
echo "0.1" >.git/ctags/floating-point &&
gitweb_run'
--
2.25.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v2 2/2] t: fix whitespace around &&
2020-03-22 21:14 ` [PATCH v2 1/2] t9500: remove spaces after redirect operators Andrei Rybak
@ 2020-03-22 21:14 ` Andrei Rybak
2020-03-22 23:45 ` Junio C Hamano
0 siblings, 1 reply; 10+ messages in thread
From: Andrei Rybak @ 2020-03-22 21:14 UTC (permalink / raw)
To: git, sunshine; +Cc: Andrei Rybak
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>
---
Changes since v1:
Added two more fixes for tabs after &&, updated commit message
correspondingly. One new fix is in t3417-rebase-whitespace-fix.sh and
another in t5604-clone-reference.sh.
t/t2402-worktree-list.sh | 2 +-
t/t3417-rebase-whitespace-fix.sh | 4 ++--
t/t3700-add.sh | 2 +-
t/t3701-add-interactive.sh | 2 +-
t/t4057-diff-combined-paths.sh | 2 +-
t/t4150-am.sh | 2 +-
t/t5537-fetch-shallow.sh | 2 +-
t/t5604-clone-reference.sh | 2 +-
t/t7400-submodule-basic.sh | 4 ++--
t/t7609-merge-co-error-msgs.sh | 2 +-
t/t9010-svn-fe.sh | 2 +-
t/t9500-gitweb-standalone-no-errors.sh | 4 ++--
t/t9831-git-p4-triggers.sh | 2 +-
13 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/t/t2402-worktree-list.sh b/t/t2402-worktree-list.sh
index 69ffe865b4..52585ec2aa 100755
--- a/t/t2402-worktree-list.sh
+++ b/t/t2402-worktree-list.sh
@@ -152,7 +152,7 @@ test_expect_success 'linked worktrees are sorted' '
'
test_expect_success 'worktree path when called in .git directory' '
- git worktree list >list1&&
+ git worktree list >list1 &&
git -C .git worktree list >list2 &&
test_cmp list1 list2
'
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
'
diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index 88bc799807..b7d4ba608c 100755
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -192,7 +192,7 @@ test_expect_success 'git add --refresh with pathspec' '
test_must_be_empty actual &&
git diff-files --name-only >actual &&
- ! grep bar actual&&
+ ! grep bar actual &&
grep baz actual
'
diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
index 5bae6e50f1..b3d8bb7577 100755
--- a/t/t3701-add-interactive.sh
+++ b/t/t3701-add-interactive.sh
@@ -780,7 +780,7 @@ test_expect_success 'add -p patch editing works with pathological context lines'
test_expect_success 'checkout -p works with pathological context lines' '
test_write_lines a a a a a a >a &&
git add a &&
- test_write_lines a b a b a b a b a b a > a&&
+ test_write_lines a b a b a b a b a b a >a &&
test_write_lines s n n y q | git checkout -p &&
test_write_lines a b a b a a b a b a >expect &&
test_cmp expect a
diff --git a/t/t4057-diff-combined-paths.sh b/t/t4057-diff-combined-paths.sh
index 4f4b541658..0b78573733 100755
--- a/t/t4057-diff-combined-paths.sh
+++ b/t/t4057-diff-combined-paths.sh
@@ -14,7 +14,7 @@ diffc_verify () {
test_expect_success 'trivial merge - combine-diff empty' '
for i in $(test_seq 1 9)
do
- echo $i >$i.txt &&
+ echo $i >$i.txt &&
git add $i.txt
done &&
git commit -m "init" &&
diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index cb45271457..bda4586a79 100755
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -166,7 +166,7 @@ test_expect_success setup '
test_tick &&
git commit -m third &&
- git format-patch --stdout first >patch2 &&
+ git format-patch --stdout first >patch2 &&
git checkout -b lorem &&
sed -n -e "11,\$p" msg >file &&
diff --git a/t/t5537-fetch-shallow.sh b/t/t5537-fetch-shallow.sh
index 4f681dbbe1..b57209c84f 100755
--- a/t/t5537-fetch-shallow.sh
+++ b/t/t5537-fetch-shallow.sh
@@ -131,7 +131,7 @@ test_expect_success 'fetch that requires changes in .git/shallow is filtered' '
git init notshallow &&
(
cd notshallow &&
- git fetch ../shallow/.git refs/heads/*:refs/remotes/shallow/*&&
+ git fetch ../shallow/.git refs/heads/*:refs/remotes/shallow/* &&
git for-each-ref --format="%(refname)" >actual.refs &&
cat <<EOF >expect.refs &&
refs/remotes/shallow/no-shallow
diff --git a/t/t5604-clone-reference.sh b/t/t5604-clone-reference.sh
index 0c74b4e21a..2f7be23044 100755
--- a/t/t5604-clone-reference.sh
+++ b/t/t5604-clone-reference.sh
@@ -175,7 +175,7 @@ test_expect_success 'clone using repo pointed at by gitfile as reference' '
test_expect_success 'clone and dissociate from reference' '
git init P &&
(
- cd P && test_commit one
+ cd P && test_commit one
) &&
git clone P Q &&
(
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index e3e2aab3b0..956e17abb3 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -938,7 +938,7 @@ test_expect_success 'submodule add --name allows to replace a submodule with ano
echo "repo" >expect &&
test_must_fail git config -f .gitmodules submodule.repo.path &&
git config -f .gitmodules submodule.repo_new.path >actual &&
- test_cmp expect actual&&
+ test_cmp expect actual &&
echo "$submodurl/repo" >expect &&
test_must_fail git config -f .gitmodules submodule.repo.url &&
echo "$submodurl/bare.git" >expect &&
@@ -1010,7 +1010,7 @@ test_expect_success 'submodule add with an existing name fails unless forced' '
test -d repo &&
echo "repo" >expect &&
git config -f .gitmodules submodule.repo_new.path >actual &&
- test_cmp expect actual&&
+ test_cmp expect actual &&
echo "$submodurl/repo.git" >expect &&
git config -f .gitmodules submodule.repo_new.url >actual &&
test_cmp expect actual &&
diff --git a/t/t7609-merge-co-error-msgs.sh b/t/t7609-merge-co-error-msgs.sh
index e90413204e..5c8894d94f 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 &&
diff --git a/t/t9010-svn-fe.sh b/t/t9010-svn-fe.sh
index c90fdc5c89..83f8f5cacb 100755
--- a/t/t9010-svn-fe.sh
+++ b/t/t9010-svn-fe.sh
@@ -486,7 +486,7 @@ test_expect_success 'NUL in property value' '
{
properties \
unimportant "something with a NUL (Q)" \
- svn:log "commit message"&&
+ svn:log "commit message" &&
echo PROPS-END
} |
q_to_nul >props &&
diff --git a/t/t9500-gitweb-standalone-no-errors.sh b/t/t9500-gitweb-standalone-no-errors.sh
index 784df80858..267ddc997d 100755
--- a/t/t9500-gitweb-standalone-no-errors.sh
+++ b/t/t9500-gitweb-standalone-no-errors.sh
@@ -348,7 +348,7 @@ test_expect_success \
echo "To be renamed and changed" >04-rename-from &&
echo "To have mode changed" >05-mode-change &&
echo "File to symlink" >06-file-or-symlink &&
- echo "To be changed and have mode changed" >07-change-mode-change &&
+ echo "To be changed and have mode changed" >07-change-mode-change &&
git add 0* &&
git commit -a -m "Prepare large commit" &&
echo "Changed" >01-change &&
@@ -361,7 +361,7 @@ test_expect_success \
test_chmod +x 05-mode-change &&
rm -f 06-file-or-symlink &&
test_ln_s_add 01-change 06-file-or-symlink &&
- echo "Changed and have mode changed" >07-change-mode-change &&
+ echo "Changed and have mode changed" >07-change-mode-change &&
test_chmod +x 07-change-mode-change &&
git commit -a -m "Large commit" &&
git checkout master'
diff --git a/t/t9831-git-p4-triggers.sh b/t/t9831-git-p4-triggers.sh
index d743ca33ee..ff6c0352e6 100755
--- a/t/t9831-git-p4-triggers.sh
+++ b/t/t9831-git-p4-triggers.sh
@@ -58,7 +58,7 @@ test_expect_success 'import with extra info lines from verbose p4 trigger' '
(
cd "$git" &&
git p4 sync
- )&&
+ ) &&
(
p4 triggers -i <<-EOF
Triggers:
--
2.25.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v2 2/2] t: fix whitespace around &&
2020-03-22 21:14 ` [PATCH v2 2/2] t: fix whitespace around && Andrei Rybak
@ 2020-03-22 23:45 ` Junio C Hamano
0 siblings, 0 replies; 10+ messages in thread
From: Junio C Hamano @ 2020-03-22 23:45 UTC (permalink / raw)
To: Andrei Rybak; +Cc: git, sunshine
Andrei Rybak <rybak.a.v@gmail.com> writes:
> Add missing spaces before '&&' and switch tabs around '&&' to spaces.
The latter is especially appreciated---people just don't pay
attention and it is much harder to spot with eyeballs than the
former.
> Also fix the space after redirection operator in t3701 while we're here.
I started writing "hmm, doesn't it belong to the previous step" and
then realized that this one is a bat between animals and birds ;-)
Thanks.
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH] t: fix whitespace around &&
@ 2021-06-07 13:13 Andrei Rybak
2021-06-07 14:10 ` Derrick Stolee
2021-06-07 18:48 ` Junio C Hamano
0 siblings, 2 replies; 10+ messages in thread
From: Andrei Rybak @ 2021-06-07 13:13 UTC (permalink / raw)
To: git
Add missing spaces before '&&' and switch tabs around '&&' to spaces.
These issues were found using `git grep '[^ ]&&$'` and
`git grep -P '&&\t'`.
Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com>
---
contrib/mw-to-git/t/t9360-mw-to-git-clone.sh | 2 +-
contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh | 4 ++--
t/t1092-sparse-checkout-compatibility.sh | 2 +-
t/t3920-crlf-messages.sh | 2 +-
t/t4203-mailmap.sh | 2 +-
t/t4205-log-pretty-formats.sh | 2 +-
t/t7800-difftool.sh | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh b/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh
index 4c39bda7bf..f08890d9e7 100755
--- a/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh
+++ b/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh
@@ -86,7 +86,7 @@ test_expect_success 'Git clone works with page added' '
test_expect_success 'Git clone works with an edited page ' '
wiki_reset &&
wiki_editpage foo "this page will be edited" \
- false -s "first edition of page foo"&&
+ false -s "first edition of page foo" &&
wiki_editpage foo "this page has been edited and must be on the clone " true &&
git clone mediawiki::'"$WIKI_URL"' mw_dir_6 &&
test_path_is_file mw_dir_6/Foo.mw &&
diff --git a/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh b/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh
index 6b0dbdac4d..526d92850f 100755
--- a/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh
+++ b/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh
@@ -287,7 +287,7 @@ test_expect_success 'git push with \' '
git add \\ko\\o.mw &&
git commit -m " \\ko\\o added" &&
git push
- )&&
+ ) &&
wiki_page_exist \\ko\\o &&
wiki_check_content mw_dir_18/\\ko\\o.mw \\ko\\o
@@ -311,7 +311,7 @@ test_expect_success 'git push with \ in format control' '
git add \\fo\\o.mw &&
git commit -m " \\fo\\o added" &&
git push
- )&&
+ ) &&
wiki_page_exist \\fo\\o &&
wiki_check_content mw_dir_20/\\fo\\o.mw \\fo\\o
diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh
index e9a815ca7a..d028b73eba 100755
--- a/t/t1092-sparse-checkout-compatibility.sh
+++ b/t/t1092-sparse-checkout-compatibility.sh
@@ -268,7 +268,7 @@ test_expect_success 'diff with renames' '
for branch in rename-out-to-out rename-out-to-in rename-in-to-out
do
test_all_match git checkout rename-base &&
- test_all_match git checkout $branch -- .&&
+ test_all_match git checkout $branch -- . &&
test_all_match git diff --staged --no-renames &&
test_all_match git diff --staged --find-renames || return 1
done
diff --git a/t/t3920-crlf-messages.sh b/t/t3920-crlf-messages.sh
index 70ddce3a2e..a8ad5462d9 100755
--- a/t/t3920-crlf-messages.sh
+++ b/t/t3920-crlf-messages.sh
@@ -64,7 +64,7 @@ test_crlf_subject_body_and_contents() {
while test -n "${atoms}"
do
set ${atoms} && atom=$1 && shift && atoms="$*" &&
- set ${files} && file=$1 && shift && files="$*" &&
+ set ${files} && file=$1 && shift && files="$*" &&
test_expect_success "${command}: --format='%${atom}' works with messages using CRLF" "
rm -f expect &&
for ref in ${LIB_CRLF_BRANCHES}
diff --git a/t/t4203-mailmap.sh b/t/t4203-mailmap.sh
index d8e7374234..0b2d21ec55 100755
--- a/t/t4203-mailmap.sh
+++ b/t/t4203-mailmap.sh
@@ -959,7 +959,7 @@ test_expect_success SYMLINKS 'symlinks not respected in-tree' '
test_when_finished "rm .mailmap" &&
ln -s map .mailmap &&
git log -1 --format=%aE >actual &&
- echo "orig@example.com" >expect&&
+ echo "orig@example.com" >expect &&
test_cmp expect actual
'
diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh
index 8272d94ce6..5865daa8f8 100755
--- a/t/t4205-log-pretty-formats.sh
+++ b/t/t4205-log-pretty-formats.sh
@@ -988,7 +988,7 @@ test_expect_success '%(describe) vs git describe' '
test_expect_success '%(describe:match=...) vs git describe --match ...' '
test_when_finished "git tag -d tag-match" &&
- git tag -a -m tagged tag-match&&
+ git tag -a -m tagged tag-match &&
git describe --match "*-match" >expect &&
git log -1 --format="%(describe:match=*-match)" >actual &&
test_cmp expect actual
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index 3e041e83ae..a173f564bc 100755
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -770,7 +770,7 @@ test_expect_success 'difftool --rotate-to' '
echo 4 >4 &&
git add 1 2 4 &&
git commit -a -m "124" &&
- git difftool --no-prompt --extcmd=cat --rotate-to="2" HEAD^ >output&&
+ git difftool --no-prompt --extcmd=cat --rotate-to="2" HEAD^ >output &&
cat >expect <<-\EOF &&
2
4
--
2.31.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH] t: fix whitespace around &&
2021-06-07 13:13 [PATCH] " Andrei Rybak
@ 2021-06-07 14:10 ` Derrick Stolee
2021-06-07 18:48 ` Junio C Hamano
1 sibling, 0 replies; 10+ messages in thread
From: Derrick Stolee @ 2021-06-07 14:10 UTC (permalink / raw)
To: Andrei Rybak, git
On 6/7/2021 9:13 AM, Andrei Rybak wrote:
> Add missing spaces before '&&' and switch tabs around '&&' to spaces.
>
> These issues were found using `git grep '[^ ]&&$'` and
> `git grep -P '&&\t'`.
Thanks for this mostly-obvious cleanup, especially for fixing the
mistakes I made.
> - set ${files} && file=$1 && shift && files="$*" &&
> + set ${files} && file=$1 && shift && files="$*" &&
This is the one that is not obvious, but it is because of
an instance of "&&\t" in the middle of the line. Thanks for
catching it!
-Stolee
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] t: fix whitespace around &&
2021-06-07 13:13 [PATCH] " Andrei Rybak
2021-06-07 14:10 ` Derrick Stolee
@ 2021-06-07 18:48 ` Junio C Hamano
1 sibling, 0 replies; 10+ messages in thread
From: Junio C Hamano @ 2021-06-07 18:48 UTC (permalink / raw)
To: Andrei Rybak; +Cc: git
Andrei Rybak <rybak.a.v@gmail.com> writes:
> Add missing spaces before '&&' and switch tabs around '&&' to spaces.
>
> These issues were found using `git grep '[^ ]&&$'` and
> `git grep -P '&&\t'`.
>
> Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com>
> ---
> contrib/mw-to-git/t/t9360-mw-to-git-clone.sh | 2 +-
> contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh | 4 ++--
> t/t1092-sparse-checkout-compatibility.sh | 2 +-
> t/t3920-crlf-messages.sh | 2 +-
> t/t4203-mailmap.sh | 2 +-
> t/t4205-log-pretty-formats.sh | 2 +-
> t/t7800-difftool.sh | 2 +-
> 7 files changed, 8 insertions(+), 8 deletions(-)
Looks trivially correct, all of them. Thanks.
> diff --git a/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh b/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh
> index 4c39bda7bf..f08890d9e7 100755
> --- a/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh
> +++ b/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh
> @@ -86,7 +86,7 @@ test_expect_success 'Git clone works with page added' '
> test_expect_success 'Git clone works with an edited page ' '
> wiki_reset &&
> wiki_editpage foo "this page will be edited" \
> - false -s "first edition of page foo"&&
> + false -s "first edition of page foo" &&
> wiki_editpage foo "this page has been edited and must be on the clone " true &&
> git clone mediawiki::'"$WIKI_URL"' mw_dir_6 &&
> test_path_is_file mw_dir_6/Foo.mw &&
> diff --git a/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh b/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh
> index 6b0dbdac4d..526d92850f 100755
> --- a/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh
> +++ b/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh
> @@ -287,7 +287,7 @@ test_expect_success 'git push with \' '
> git add \\ko\\o.mw &&
> git commit -m " \\ko\\o added" &&
> git push
> - )&&
> + ) &&
> wiki_page_exist \\ko\\o &&
> wiki_check_content mw_dir_18/\\ko\\o.mw \\ko\\o
>
> @@ -311,7 +311,7 @@ test_expect_success 'git push with \ in format control' '
> git add \\fo\\o.mw &&
> git commit -m " \\fo\\o added" &&
> git push
> - )&&
> + ) &&
> wiki_page_exist \\fo\\o &&
> wiki_check_content mw_dir_20/\\fo\\o.mw \\fo\\o
>
> diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh
> index e9a815ca7a..d028b73eba 100755
> --- a/t/t1092-sparse-checkout-compatibility.sh
> +++ b/t/t1092-sparse-checkout-compatibility.sh
> @@ -268,7 +268,7 @@ test_expect_success 'diff with renames' '
> for branch in rename-out-to-out rename-out-to-in rename-in-to-out
> do
> test_all_match git checkout rename-base &&
> - test_all_match git checkout $branch -- .&&
> + test_all_match git checkout $branch -- . &&
> test_all_match git diff --staged --no-renames &&
> test_all_match git diff --staged --find-renames || return 1
> done
> diff --git a/t/t3920-crlf-messages.sh b/t/t3920-crlf-messages.sh
> index 70ddce3a2e..a8ad5462d9 100755
> --- a/t/t3920-crlf-messages.sh
> +++ b/t/t3920-crlf-messages.sh
> @@ -64,7 +64,7 @@ test_crlf_subject_body_and_contents() {
> while test -n "${atoms}"
> do
> set ${atoms} && atom=$1 && shift && atoms="$*" &&
> - set ${files} && file=$1 && shift && files="$*" &&
> + set ${files} && file=$1 && shift && files="$*" &&
> test_expect_success "${command}: --format='%${atom}' works with messages using CRLF" "
> rm -f expect &&
> for ref in ${LIB_CRLF_BRANCHES}
> diff --git a/t/t4203-mailmap.sh b/t/t4203-mailmap.sh
> index d8e7374234..0b2d21ec55 100755
> --- a/t/t4203-mailmap.sh
> +++ b/t/t4203-mailmap.sh
> @@ -959,7 +959,7 @@ test_expect_success SYMLINKS 'symlinks not respected in-tree' '
> test_when_finished "rm .mailmap" &&
> ln -s map .mailmap &&
> git log -1 --format=%aE >actual &&
> - echo "orig@example.com" >expect&&
> + echo "orig@example.com" >expect &&
> test_cmp expect actual
> '
>
> diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh
> index 8272d94ce6..5865daa8f8 100755
> --- a/t/t4205-log-pretty-formats.sh
> +++ b/t/t4205-log-pretty-formats.sh
> @@ -988,7 +988,7 @@ test_expect_success '%(describe) vs git describe' '
>
> test_expect_success '%(describe:match=...) vs git describe --match ...' '
> test_when_finished "git tag -d tag-match" &&
> - git tag -a -m tagged tag-match&&
> + git tag -a -m tagged tag-match &&
> git describe --match "*-match" >expect &&
> git log -1 --format="%(describe:match=*-match)" >actual &&
> test_cmp expect actual
> diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
> index 3e041e83ae..a173f564bc 100755
> --- a/t/t7800-difftool.sh
> +++ b/t/t7800-difftool.sh
> @@ -770,7 +770,7 @@ test_expect_success 'difftool --rotate-to' '
> echo 4 >4 &&
> git add 1 2 4 &&
> git commit -a -m "124" &&
> - git difftool --no-prompt --extcmd=cat --rotate-to="2" HEAD^ >output&&
> + git difftool --no-prompt --extcmd=cat --rotate-to="2" HEAD^ >output &&
> cat >expect <<-\EOF &&
> 2
> 4
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2021-06-07 18:48 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-15 18:09 [PATCH] t: fix whitespace around && Andrei Rybak
2020-03-15 18:20 ` Eric Sunshine
2020-03-15 18:35 ` Andrei Rybak
2020-03-15 18:38 ` Eric Sunshine
2020-03-22 21:14 ` [PATCH v2 1/2] t9500: remove spaces after redirect operators Andrei Rybak
2020-03-22 21:14 ` [PATCH v2 2/2] t: fix whitespace around && Andrei Rybak
2020-03-22 23:45 ` Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2021-06-07 13:13 [PATCH] " Andrei Rybak
2021-06-07 14:10 ` Derrick Stolee
2021-06-07 18:48 ` Junio C Hamano
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).