From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Han-Wen Nienhuys via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Han-Wen Nienhuys <hanwenn@gmail.com>,
Han-Wen Nienhuys <hanwen@google.com>
Subject: Re: [PATCH v2 08/21] t5000: reformat indentation to the latest fashion
Date: Thu, 20 May 2021 17:24:11 +0200 [thread overview]
Message-ID: <87v97dpgtf.fsf@evledraar.gmail.com> (raw)
In-Reply-To: <e67b90847c4eb78fff786944c04413f8a02cffb4.1619519903.git.gitgitgadget@gmail.com>
On Tue, Apr 27 2021, Han-Wen Nienhuys via GitGitGadget wrote:
> From: Han-Wen Nienhuys <hanwen@google.com>
>
> Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
> ---
> t/t5000-tar-tree.sh | 104 ++++++++++++++++++++++----------------------
> 1 file changed, 53 insertions(+), 51 deletions(-)
>
> diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh
> index 7204799a0b52..b6734cba7e65 100755
> --- a/t/t5000-tar-tree.sh
> +++ b/t/t5000-tar-tree.sh
> @@ -111,25 +111,25 @@ test_expect_success 'setup' '
> EOF
> '
>
> -test_expect_success \
> - 'populate workdir' \
> - 'mkdir a &&
> - echo simple textfile >a/a &&
> - ten=0123456789 && hundred=$ten$ten$ten$ten$ten$ten$ten$ten$ten$ten &&
> - echo long filename >a/four$hundred &&
> - mkdir a/bin &&
> - test-tool genrandom "frotz" 500000 >a/bin/sh &&
> - printf "A\$Format:%s\$O" "$SUBSTFORMAT" >a/substfile1 &&
> - printf "A not substituted O" >a/substfile2 &&
> - if test_have_prereq SYMLINKS; then
> - ln -s a a/l1
> - else
> - printf %s a > a/l1
> - fi &&
> - (p=long_path_to_a_file && cd a &&
> - for depth in 1 2 3 4 5; do mkdir $p && cd $p; done &&
> - echo text >file_with_long_path) &&
> - (cd a && find .) | sort >a.lst'
> +test_expect_success 'populate workdir' '
> + mkdir a &&
> + echo simple textfile >a/a &&
> + ten=0123456789 && hundred=$ten$ten$ten$ten$ten$ten$ten$ten$ten$ten &&
> + echo long filename >a/four$hundred &&
> + mkdir a/bin &&
> + test-tool genrandom "frotz" 500000 >a/bin/sh &&
> + printf "A\$Format:%s\$O" "$SUBSTFORMAT" >a/substfile1 &&
> + printf "A not substituted O" >a/substfile2 &&
> + if test_have_prereq SYMLINKS; then
> + ln -s a a/l1
> + else
> + printf %s a >a/l1
> + fi &&
> + (p=long_path_to_a_file && cd a &&
> + for depth in 1 2 3 4 5; do mkdir $p && cd $p; done &&
> + echo text >file_with_long_path) &&
> + (cd a && find .) | sort >a.lst
> +'
Since we're refactoring this anyway, let's:
* split up ten=... hundred=... into two lines
* put "; then" on its own line, if ...\nthen\n...
* split up that sub-shell into (\np=...&& ..., i.e. our usual style, some with the one-line for-loop
> test_expect_success \
> 'add ignored file' \
> @@ -147,18 +147,18 @@ test_expect_success 'setup export-subst' '
> >a/substfile1
> '
>
> -test_expect_success \
> - 'create bare clone' \
> - 'git clone --bare . bare.git &&
> - cp .git/info/attributes bare.git/info/attributes'
> +test_expect_success 'create bare clone' '
> + git clone --bare . bare.git &&
> + cp .git/info/attributes bare.git/info/attributes
> +'
>
> -test_expect_success \
> - 'remove ignored file' \
> - 'rm a/ignored'
> +test_expect_success 'remove ignored file' '
> + rm a/ignored
> +'
>
> -test_expect_success \
> - 'git archive' \
> - 'git archive HEAD >b.tar'
> +test_expect_success 'git archive' '
> + git archive HEAD >b.tar
> +'
>
> check_tar b
>
> @@ -194,26 +194,28 @@ check_added with_untracked2 untracked one/untracked
> check_added with_untracked2 untracked two/untracked
>
> test_expect_success 'git archive on large files' '
> - test_config core.bigfilethreshold 1 &&
> - git archive HEAD >b3.tar &&
> - test_cmp_bin b.tar b3.tar
> + test_config core.bigfilethreshold 1 &&
> + git archive HEAD >b3.tar &&
> + test_cmp_bin b.tar b3.tar
> '
>
> -test_expect_success \
> - 'git archive in a bare repo' \
> - '(cd bare.git && git archive HEAD) >b3.tar'
> +test_expect_success 'git archive in a bare repo' '
> + (cd bare.git && git archive HEAD) >b3.tar
> +'
Ditto subshell etc. on one line, can't this be git -C bare.git archive
HEAD >b3.tar?
>
> -test_expect_success \
> - 'git archive vs. the same in a bare repo' \
> - 'test_cmp_bin b.tar b3.tar'
> +test_expect_success 'git archive vs. the same in a bare repo' '
> + test_cmp_bin b.tar b3.tar
> +'
>
> -test_expect_success 'git archive with --output' \
> - 'git archive --output=b4.tar HEAD &&
> - test_cmp_bin b.tar b4.tar'
> +test_expect_success 'git archive with --output' '
> + git archive --output=b4.tar HEAD &&
> + test_cmp_bin b.tar b4.tar
> +'
>
> -test_expect_success 'git archive --remote' \
> - 'git archive --remote=. HEAD >b5.tar &&
> - test_cmp_bin b.tar b5.tar'
> +test_expect_success 'git archive --remote' '
> + git archive --remote=. HEAD >b5.tar &&
> + test_cmp_bin b.tar b5.tar
> +'
>
> test_expect_success 'git archive --remote with configured remote' '
> git config remote.foo.url . &&
> @@ -224,13 +226,13 @@ test_expect_success 'git archive --remote with configured remote' '
> test_cmp_bin b.tar b5-nick.tar
> '
>
> -test_expect_success \
> - 'validate file modification time' \
> - 'mkdir extract &&
> - "$TAR" xf b.tar -C extract a/a &&
> - test-tool chmtime --get extract/a/a >b.mtime &&
> - echo "1117231200" >expected.mtime &&
> - test_cmp expected.mtime b.mtime'
> +test_expect_success 'validate file modification time' '
> + mkdir extract &&
> + "$TAR" xf b.tar -C extract a/a &&
> + test-tool chmtime --get extract/a/a >b.mtime &&
> + echo "1117231200" >expected.mtime &&
> + test_cmp expected.mtime b.mtime
> +'
>
> test_expect_success \
> 'git get-tar-commit-id' \
next prev parent reply other threads:[~2021-05-20 15:26 UTC|newest]
Thread overview: 138+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-19 10:52 [PATCH 00/18] Prepare tests for reftable backend Han-Wen Nienhuys via GitGitGadget
2021-04-19 10:52 ` [PATCH 01/18] t4202: split testcase for invalid HEAD symref and HEAD hash Han-Wen Nienhuys via GitGitGadget
2021-04-19 21:11 ` SZEDER Gábor
2021-04-27 9:14 ` Han-Wen Nienhuys
2021-04-19 10:52 ` [PATCH 02/18] t9300: check ref existence using git-rev-parse rather than FS check Han-Wen Nienhuys via GitGitGadget
2021-04-21 6:01 ` Ævar Arnfjörð Bjarmason
2021-04-27 9:20 ` Han-Wen Nienhuys
2021-04-19 10:52 ` [PATCH 03/18] t5601: read HEAD using rev-parse Han-Wen Nienhuys via GitGitGadget
2021-04-19 10:52 ` [PATCH 04/18] t1401-symbolic-ref: avoid direct filesystem access Han-Wen Nienhuys via GitGitGadget
2021-04-19 20:38 ` SZEDER Gábor
2021-04-27 9:13 ` Han-Wen Nienhuys
2021-04-21 6:09 ` Ævar Arnfjörð Bjarmason
2021-04-21 9:09 ` Han-Wen Nienhuys
2021-04-22 4:59 ` SZEDER Gábor
2021-04-22 13:01 ` Han-Wen Nienhuys
2021-04-23 5:12 ` SZEDER Gábor
2021-04-23 7:47 ` Han-Wen Nienhuys
2021-04-23 7:53 ` Han-Wen Nienhuys
2021-04-23 9:16 ` Ævar Arnfjörð Bjarmason
2021-04-26 18:01 ` Han-Wen Nienhuys
2021-04-19 10:52 ` [PATCH 05/18] t1413: use tar to save and restore entire .git directory Han-Wen Nienhuys via GitGitGadget
2021-04-20 22:51 ` Junio C Hamano
2021-04-27 9:15 ` Han-Wen Nienhuys
2021-04-19 10:52 ` [PATCH 06/18] t1301: fix typo in error message Han-Wen Nienhuys via GitGitGadget
2021-04-19 10:52 ` [PATCH 07/18] t5000: inspect HEAD using git-rev-parse Han-Wen Nienhuys via GitGitGadget
2021-04-21 6:11 ` Ævar Arnfjörð Bjarmason
2021-04-27 9:22 ` Han-Wen Nienhuys
2021-04-19 10:52 ` [PATCH 08/18] t7003: use rev-parse rather than FS inspection Han-Wen Nienhuys via GitGitGadget
2021-04-19 10:52 ` [PATCH 09/18] t5304: use "reflog expire --all" to clear the reflog Han-Wen Nienhuys via GitGitGadget
2021-04-21 6:13 ` Ævar Arnfjörð Bjarmason
2021-04-27 9:23 ` Han-Wen Nienhuys
2021-04-19 10:52 ` [PATCH 10/18] test-lib: provide test prereq REFFILES Han-Wen Nienhuys via GitGitGadget
2021-04-20 22:57 ` Junio C Hamano
2021-04-20 23:37 ` Junio C Hamano
2021-04-26 11:09 ` Han-Wen Nienhuys
2021-04-27 9:16 ` Han-Wen Nienhuys
2021-04-19 10:52 ` [PATCH 11/18] t1407: require REFFILES for for_each_reflog test Han-Wen Nienhuys via GitGitGadget
2021-04-21 6:23 ` Ævar Arnfjörð Bjarmason
2021-04-27 9:27 ` Han-Wen Nienhuys
2021-04-19 10:52 ` [PATCH 12/18] t1414: mark corruption test with REFFILES Han-Wen Nienhuys via GitGitGadget
2021-04-19 10:52 ` [PATCH 13/18] t2017: mark --orphan/logAllRefUpdates=false test as REFFILES Han-Wen Nienhuys via GitGitGadget
2021-04-21 6:39 ` Ævar Arnfjörð Bjarmason
2021-04-29 18:14 ` Han-Wen Nienhuys
2021-04-19 10:52 ` [PATCH 14/18] t1404: mark tests that muck with .git directly " Han-Wen Nienhuys via GitGitGadget
2021-04-21 6:57 ` Ævar Arnfjörð Bjarmason
2021-04-26 18:36 ` Han-Wen Nienhuys
2021-04-19 10:53 ` [PATCH 15/18] t7900: mark pack-refs tests " Han-Wen Nienhuys via GitGitGadget
2021-04-21 7:00 ` Ævar Arnfjörð Bjarmason
2021-04-27 9:41 ` Han-Wen Nienhuys
2021-04-19 10:53 ` [PATCH 16/18] t7003: check reflog existence only for REFFILES Han-Wen Nienhuys via GitGitGadget
2021-04-20 22:59 ` Junio C Hamano
2021-04-26 17:42 ` Han-Wen Nienhuys
2021-04-27 9:17 ` Han-Wen Nienhuys
2021-04-21 7:02 ` Ævar Arnfjörð Bjarmason
2021-04-19 10:53 ` [PATCH 17/18] t4202: mark bogus head hash test with REFFILES Han-Wen Nienhuys via GitGitGadget
2021-04-21 7:08 ` Ævar Arnfjörð Bjarmason
2021-04-26 18:02 ` Han-Wen Nienhuys
2021-04-19 10:53 ` [PATCH 18/18] t1415: set REFFILES for test specific to storage format Han-Wen Nienhuys via GitGitGadget
2021-04-21 7:15 ` Ævar Arnfjörð Bjarmason
2021-04-26 17:41 ` Han-Wen Nienhuys
2021-04-27 10:38 ` [PATCH v2 00/21] Prepare tests for reftable backend Han-Wen Nienhuys via GitGitGadget
2021-04-27 10:38 ` [PATCH v2 01/21] t4202: split testcase for invalid HEAD symref and HEAD hash Han-Wen Nienhuys via GitGitGadget
2021-05-20 15:03 ` Ævar Arnfjörð Bjarmason
2021-05-31 13:54 ` Han-Wen Nienhuys
2021-04-27 10:38 ` [PATCH v2 02/21] t/helper/ref-store: initialize oid in resolve-ref Han-Wen Nienhuys via GitGitGadget
2021-05-20 15:06 ` Ævar Arnfjörð Bjarmason
2021-05-31 14:48 ` Han-Wen Nienhuys
2021-04-27 10:38 ` [PATCH v2 03/21] t9300: check ref existence using test-helper rather than a file system check Han-Wen Nienhuys via GitGitGadget
2021-05-20 15:11 ` Ævar Arnfjörð Bjarmason
2021-04-27 10:38 ` [PATCH v2 04/21] t5601: read HEAD using rev-parse Han-Wen Nienhuys via GitGitGadget
2021-04-27 10:38 ` [PATCH v2 05/21] t1401-symbolic-ref: avoid direct filesystem access Han-Wen Nienhuys via GitGitGadget
2021-05-20 15:20 ` Ævar Arnfjörð Bjarmason
2021-05-31 13:40 ` Han-Wen Nienhuys
2021-04-27 10:38 ` [PATCH v2 06/21] t1413: use tar to save and restore entire .git directory Han-Wen Nienhuys via GitGitGadget
2021-05-20 15:22 ` Ævar Arnfjörð Bjarmason
2021-05-31 15:16 ` Han-Wen Nienhuys
2021-04-27 10:38 ` [PATCH v2 07/21] t1301: fix typo in error message Han-Wen Nienhuys via GitGitGadget
2021-04-27 10:38 ` [PATCH v2 08/21] t5000: reformat indentation to the latest fashion Han-Wen Nienhuys via GitGitGadget
2021-05-20 15:24 ` Ævar Arnfjörð Bjarmason [this message]
2021-05-31 13:56 ` Han-Wen Nienhuys
2021-04-27 10:38 ` [PATCH v2 09/21] t5000: inspect HEAD using git-rev-parse Han-Wen Nienhuys via GitGitGadget
2021-04-27 10:38 ` [PATCH v2 10/21] t7003: use rev-parse rather than FS inspection Han-Wen Nienhuys via GitGitGadget
2021-04-27 10:38 ` [PATCH v2 11/21] t5304: restyle: trim empty lines, drop ':' before > Han-Wen Nienhuys via GitGitGadget
2021-04-27 10:38 ` [PATCH v2 12/21] t5304: use "reflog expire --all" to clear the reflog Han-Wen Nienhuys via GitGitGadget
2021-05-20 15:27 ` Ævar Arnfjörð Bjarmason
2021-05-31 14:04 ` Han-Wen Nienhuys
2021-04-27 10:38 ` [PATCH v2 13/21] test-lib: provide test prereq REFFILES Han-Wen Nienhuys via GitGitGadget
2021-04-27 10:38 ` [PATCH v2 14/21] t1407: require REFFILES for for_each_reflog test Han-Wen Nienhuys via GitGitGadget
2021-04-27 10:38 ` [PATCH v2 15/21] t1414: mark corruption test with REFFILES Han-Wen Nienhuys via GitGitGadget
2021-05-20 15:31 ` Ævar Arnfjörð Bjarmason
2021-04-27 10:38 ` [PATCH v2 16/21] t2017: mark --orphan/logAllRefUpdates=false test as REFFILES Han-Wen Nienhuys via GitGitGadget
2021-05-20 15:38 ` Ævar Arnfjörð Bjarmason
2021-04-27 10:38 ` [PATCH v2 17/21] t1404: mark tests that muck with .git directly " Han-Wen Nienhuys via GitGitGadget
2021-04-27 10:38 ` [PATCH v2 18/21] t7900: mark pack-refs tests " Han-Wen Nienhuys via GitGitGadget
2021-05-20 15:40 ` Ævar Arnfjörð Bjarmason
2021-05-31 14:08 ` Han-Wen Nienhuys
2021-04-27 10:38 ` [PATCH v2 19/21] t7003: check reflog existence only for REFFILES Han-Wen Nienhuys via GitGitGadget
2021-05-20 15:41 ` Ævar Arnfjörð Bjarmason
2021-05-31 14:27 ` Han-Wen Nienhuys
2021-04-27 10:38 ` [PATCH v2 20/21] t4202: mark bogus head hash test with REFFILES Han-Wen Nienhuys via GitGitGadget
2021-05-20 15:43 ` Ævar Arnfjörð Bjarmason
2021-05-31 14:21 ` Han-Wen Nienhuys
2021-04-27 10:38 ` [PATCH v2 21/21] t1415: set REFFILES for test specific to storage format Han-Wen Nienhuys via GitGitGadget
2021-05-20 15:50 ` Ævar Arnfjörð Bjarmason
2021-05-31 14:16 ` Han-Wen Nienhuys
2021-05-31 23:36 ` Ævar Arnfjörð Bjarmason
2021-05-20 16:28 ` [PATCH v2 00/21] Prepare tests for reftable backend Ævar Arnfjörð Bjarmason
2021-05-26 9:23 ` Han-Wen Nienhuys
2021-05-26 9:52 ` Ævar Arnfjörð Bjarmason
2021-05-31 14:37 ` Han-Wen Nienhuys
2021-05-31 16:56 ` [PATCH v3 00/22] " Han-Wen Nienhuys via GitGitGadget
2021-05-31 16:56 ` [PATCH v3 01/22] t4202: split testcase for invalid HEAD symref and HEAD hash Han-Wen Nienhuys via GitGitGadget
2021-05-31 16:56 ` [PATCH v3 02/22] t/helper/ref-store: initialize oid in resolve-ref Han-Wen Nienhuys via GitGitGadget
2021-05-31 16:56 ` [PATCH v3 03/22] t9300: check ref existence using test-helper rather than a file system check Han-Wen Nienhuys via GitGitGadget
2021-05-31 16:56 ` [PATCH v3 04/22] t5601: read HEAD using rev-parse Han-Wen Nienhuys via GitGitGadget
2021-05-31 16:56 ` [PATCH v3 05/22] t1401: use tar to snapshot and restore repo state Han-Wen Nienhuys via GitGitGadget
2021-05-31 16:56 ` [PATCH v3 06/22] t1401-symbolic-ref: avoid direct filesystem access Han-Wen Nienhuys via GitGitGadget
2021-05-31 16:56 ` [PATCH v3 07/22] t1413: use tar to save and restore entire .git directory Han-Wen Nienhuys via GitGitGadget
2021-06-01 4:55 ` Bagas Sanjaya
2021-06-01 9:23 ` Han-Wen Nienhuys
2021-06-01 20:44 ` Junio C Hamano
2021-06-02 7:49 ` Han-Wen Nienhuys
2021-05-31 16:56 ` [PATCH v3 08/22] t1301: fix typo in error message Han-Wen Nienhuys via GitGitGadget
2021-05-31 16:56 ` [PATCH v3 09/22] t5000: reformat indentation to the latest fashion Han-Wen Nienhuys via GitGitGadget
2021-05-31 16:56 ` [PATCH v3 10/22] t5000: inspect HEAD using git-rev-parse Han-Wen Nienhuys via GitGitGadget
2021-05-31 16:56 ` [PATCH v3 11/22] t7003: use rev-parse rather than FS inspection Han-Wen Nienhuys via GitGitGadget
2021-05-31 16:56 ` [PATCH v3 12/22] t5304: restyle: trim empty lines, drop ':' before > Han-Wen Nienhuys via GitGitGadget
2021-05-31 16:56 ` [PATCH v3 13/22] t5304: use "reflog expire --all" to clear the reflog Han-Wen Nienhuys via GitGitGadget
2021-05-31 16:56 ` [PATCH v3 14/22] test-lib: provide test prereq REFFILES Han-Wen Nienhuys via GitGitGadget
2021-05-31 16:56 ` [PATCH v3 15/22] t1407: require REFFILES for for_each_reflog test Han-Wen Nienhuys via GitGitGadget
2021-05-31 16:56 ` [PATCH v3 16/22] t1414: mark corruption test with REFFILES Han-Wen Nienhuys via GitGitGadget
2021-05-31 16:56 ` [PATCH v3 17/22] t2017: mark --orphan/logAllRefUpdates=false test as REFFILES Han-Wen Nienhuys via GitGitGadget
2021-05-31 16:56 ` [PATCH v3 18/22] t1404: mark tests that muck with .git directly " Han-Wen Nienhuys via GitGitGadget
2021-05-31 16:56 ` [PATCH v3 19/22] t7900: stop checking for loose refs Han-Wen Nienhuys via GitGitGadget
2021-05-31 16:56 ` [PATCH v3 20/22] t7003: check reflog existence only for REFFILES Han-Wen Nienhuys via GitGitGadget
2021-05-31 16:56 ` [PATCH v3 21/22] t4202: mark bogus head hash test with REFFILES Han-Wen Nienhuys via GitGitGadget
2021-05-31 16:56 ` [PATCH v3 22/22] t1415: set REFFILES for test specific to storage format Han-Wen Nienhuys via GitGitGadget
2021-05-31 23:57 ` [PATCH v3 00/22] Prepare tests for reftable backend Ævar Arnfjörð Bjarmason
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=87v97dpgtf.fsf@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=hanwen@google.com \
--cc=hanwenn@gmail.com \
/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).