From: "Allo via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Allo <dinoallosaurus1111@gmail.com>,
Angel Pan <dinoallosaurus1111@gmail.com>
Subject: [PATCH] t4200-rerere.sh: use test_path_is_* functions in the script
Date: Mon, 30 Mar 2020 17:16:26 +0000 [thread overview]
Message-ID: <pull.595.git.1585588586605.gitgitgadget@gmail.com> (raw)
From: Angel Pan <dinoallosaurus1111@gmail.com>
This is a microproject for GSoC.
The original code works fine. However, since the code base has already have help-functions(in test-lib-functions),
the change is able to help people understand the code better, as well as improve debug-friendliness.
Signed-off-by: Angel Pan <dinoallosaurus1111@gmail.com>
---
[GSoC/PATCH] t4200-rerere.sh: use test_path_is_* functions in the script
Hello again. I have sent a mail here: last mail
[https://lore.kernel.org/git/CAFk=nY7efz8ZisEuyAcU09J+ja4qE8LorUUPeupGVEjBBc6HDA@mail.gmail.com/T/#u]
After all, I decided to replace test -(e|f|d) with test_path_is_*
functions as my microproject for GSoC. I am looking forward to working
with every contributor here. I also have another question: For a commit
like this involving 10+ insertions, would it be better if I
seperate-commited all of them? But this kind of change seems trivial...
Signed-off-by: Angel Pan dinoallosaurus1111@gmail.com
[dinoallosaurus1111@gmail.com]
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-595%2Fdinoallo%2Fmaster-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-595/dinoallo/master-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/595
t/t4200-rerere.sh | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index 831d424c472..da8be1c6254 100755
--- a/t/t4200-rerere.sh
+++ b/t/t4200-rerere.sh
@@ -70,7 +70,7 @@ test_expect_success 'nothing recorded without rerere' '
rm -rf .git/rr-cache &&
git config rerere.enabled false &&
test_must_fail git merge first &&
- ! test -d .git/rr-cache
+ ! test_path_is_dir .git/rr-cache
'
test_expect_success 'activate rerere, old style (conflicting merge)' '
@@ -82,8 +82,8 @@ test_expect_success 'activate rerere, old style (conflicting merge)' '
sha1=$(perl -pe "s/ .*//" .git/MERGE_RR) &&
rr=.git/rr-cache/$sha1 &&
grep "^=======\$" $rr/preimage &&
- ! test -f $rr/postimage &&
- ! test -f $rr/thisimage
+ ! test_path_is_file $rr/postimage &&
+ ! test_path_is_file $rr/thisimage
'
test_expect_success 'rerere.enabled works, too' '
@@ -108,8 +108,8 @@ test_expect_success 'set up rr-cache' '
test_expect_success 'rr-cache looks sane' '
# no postimage or thisimage yet
- ! test -f $rr/postimage &&
- ! test -f $rr/thisimage &&
+ ! test_path_is_file $rr/postimage &&
+ ! test_path_is_file $rr/thisimage &&
# preimage has right number of lines
cnt=$(sed -ne "/^<<<<<<</,/^>>>>>>>/p" $rr/preimage | wc -l) &&
@@ -165,7 +165,7 @@ test_expect_success 'first postimage wins' '
git show first:a1 | sed "s/To die: t/To die! T/" >expect &&
git commit -q -a -m "prefer first over second" &&
- test -f $rr/postimage &&
+ test_path_is_file $rr/postimage &&
oldmtimepost=$(test-tool chmtime --get -60 $rr/postimage) &&
@@ -188,14 +188,14 @@ test_expect_success 'rerere clear' '
mv $rr/postimage .git/post-saved &&
echo "$sha1 a1" | perl -pe "y/\012/\000/" >.git/MERGE_RR &&
git rerere clear &&
- ! test -d $rr
+ ! test_path_is_dir $rr
'
test_expect_success 'leftover directory' '
git reset --hard &&
mkdir -p $rr &&
test_must_fail git merge first &&
- test -f $rr/preimage
+ test_path_is_file $rr/preimage
'
test_expect_success 'missing preimage' '
@@ -203,7 +203,7 @@ test_expect_success 'missing preimage' '
mkdir -p $rr &&
cp .git/post-saved $rr/postimage &&
test_must_fail git merge first &&
- test -f $rr/preimage
+ test_path_is_file $rr/preimage
'
test_expect_success 'set up for garbage collection tests' '
@@ -228,16 +228,16 @@ test_expect_success 'set up for garbage collection tests' '
test_expect_success 'gc preserves young or recently used records' '
git rerere gc &&
- test -f $rr/preimage &&
- test -f $rr2/preimage
+ test_path_is_file $rr/preimage &&
+ test_path_is_file $rr2/preimage
'
test_expect_success 'old records rest in peace' '
test-tool chmtime =$just_over_60_days_ago $rr/postimage &&
test-tool chmtime =$just_over_15_days_ago $rr2/preimage &&
git rerere gc &&
- ! test -f $rr/preimage &&
- ! test -f $rr2/preimage
+ ! test_path_is_file $rr/preimage &&
+ ! test_path_is_file $rr2/preimage
'
rerere_gc_custom_expiry_test () {
base-commit: 9fadedd637b312089337d73c3ed8447e9f0aa775
--
gitgitgadget
next reply other threads:[~2020-03-30 17:16 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-30 17:16 Allo via GitGitGadget [this message]
2020-04-09 14:54 ` [PATCH v2] t4200-rerere.sh: use test_path_is_* functions in the script Allo via GitGitGadget
2020-04-09 15:21 ` Danh Doan
2020-04-09 18:09 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.595.git.1585588586605.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=dinoallosaurus1111@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).