t7605: use test_path_is_file instead of test -f
PATCH 1/1 t7605: use test_path_is_file instead of test -f
From: Mansi <[email protected]>
Replace old-style 'test -f' path checks with the modern test_path_is_file helper in the merge_c1_to_c2_cmds block.
The helper provides clearer failure messages and is the established convention in Git's test suite.
These instances were found using:
grep -rn "test -[efd]" t/ --include="*.sh"
---
t7605: use test_path_is_file instead of test -f
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-2067%2FMansiSingh17%2Ffix-t7605-test-path-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-2067/MansiSingh17/fix-t7605-test-path-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/2067
t/t7605-merge-resolve.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
t/t7605-merge-resolve.sh +3 -3
@@ -34,9 +34,9 @@ merge_c1_to_c2_cmds=' test "$(git rev-parse c1)" = "$(git rev-parse HEAD^1)" && test "$(git rev-parse c2)" = "$(git rev-parse HEAD^2)" && git diff --exit-code && - test -f c0.c && - test -f c1.c && - test -f c2.c && + test_path_is_file c0.c && + test_path_is_file c1.c && + test_path_is_file c2.c && test 3 = $(git ls-tree -r HEAD | wc -l) && test 3 = $(git ls-files | wc -l) '
base-commit: d181b9354cf85b44455ce3ca9e6af0b9559e0ae2
Signature · 1 line
gitgitgadget
"Mansi Singh via GitGitGadget" <[email protected]> writes:
The e-mail header seems to imply you are "Mansi Singh". Do you want to be known to this community under that name, or just "Mansi"?
Quoted 7 lines
From: Mansi <[email protected]>
Replace old-style 'test -f' path checks with the modern
test_path_is_filehelper in themerge_c1_to_c2_cmdsblock.The helper provides clearer failure messages and is the established convention in Git's test suite.
OK.
Quoted 2 lines
These instances were found using:
grep -rn "test -[efd]" t/ --include="*.sh"
People seem to add the above paragraph to their test-path helper patches, but unless the coverage of the work is fairly thorough and you want to say "all the similar issues should be found with this command and I addressed all of them", I do not see much point saying how you found one of them and addressed it.
You could have used "git grep -e <pattern> -- t/\*.sh", or you could have been working to fix something in t7605 and noticed these while you were doing something else to the file.
I do not see it as too huge a deal and it is probably not a cause to send in another iteration once it is already written, though.
Quoted 1 line
Signed-off-by Mansi <[email protected]>
No matter which name you pick, this should match the identity used on your in-body "From:" header. In this message you are using the same "Mansi" with address, which is good, but see also Documentation/SubmittingPatches::real-name section.
Quoted 5 lines
t/t7605-merge-resolve.sh +0
-0
t/t7605-merge-resolve.sh merge_c1_to_c2_cmds=' · line 39
Quoted 9 lines
t/t7605-merge-resolve.sh +3
-3@@ -34,9 +34,9 @@ merge_c1_to_c2_cmds=' test "$(git rev-parse c1)" = "$(git rev-parse HEAD^1)" && test "$(git rev-parse c2)" = "$(git rev-parse HEAD^2)" && git diff --exit-code && - test -f c0.c && - test -f c1.c && - test -f c2.c && + test_path_is_file c0.c && + test_path_is_file c1.c && + test_path_is_file c2.c &&
The patch is quite straight-forward. Good.
Quoted 5 lines
t/t7605-merge-resolve.sh +0
-0test 3 = $(git ls-tree -r HEAD | wc -l) && test 3 = $(git ls-files | wc -l) 'base-commit:
d181b9354cf85b44455ce3ca9e6af0b9559e0ae2
PATCH v2 1/1 t7605: use test_path_is_file instead of test -f
In reply to Mansi Singh via GitGitGadgetFrom: Mansi Singh <[email protected]>
Replace old-style 'test -f' path checks with the modern test_path_is_file helper in the merge_c1_to_c2_cmds block.
The helper provides clearer failure messages and is the established convention in Git's test suite.
---
t7605: use test_path_is_file instead of test -f
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-2067%2FMansiSingh17%2Ffix-t7605-test-path-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-2067/MansiSingh17/fix-t7605-test-path-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/2067
Range-diff vs v1:
1: 8753a5d919 ! 1: 388d8d7118 t7605: use test_path_is_file instead of test -f
@@
## Metadata ##
-Author: Mansi <[email protected]>
+Author: Mansi Singh <[email protected]>
## Commit message ##
t7605: use test_path_is_file instead of test -f
@@ Commit message
The helper provides clearer failure messages and is the established convention in Git's test suite.
- These instances were found using:
- grep -rn "test -[efd]" t/ --include="*.sh"
-
- Signed-off-by: Mansi <[email protected]>
+ Signed-off-by: Mansi Singh <[email protected]>
## t/t7605-merge-resolve.sh ##
@@ t/t7605-merge-resolve.sh: merge_c1_to_c2_cmds='
t/t7605-merge-resolve.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
t/t7605-merge-resolve.sh +3 -3
@@ -34,9 +34,9 @@ merge_c1_to_c2_cmds=' test "$(git rev-parse c1)" = "$(git rev-parse HEAD^1)" && test "$(git rev-parse c2)" = "$(git rev-parse HEAD^2)" && git diff --exit-code && - test -f c0.c && - test -f c1.c && - test -f c2.c && + test_path_is_file c0.c && + test_path_is_file c1.c && + test_path_is_file c2.c && test 3 = $(git ls-tree -r HEAD | wc -l) && test 3 = $(git ls-files | wc -l) '
base-commit: d181b9354cf85b44455ce3ca9e6af0b9559e0ae2
Signature · 1 line
gitgitgadget