From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com> To: git@vger.kernel.org Cc: Johannes Schindelin <johannes.schindelin@gmx.de>, Johannes Schindelin <johannes.schindelin@gmx.de> Subject: [PATCH v3 1/3] t: consolidate the `is_hidden` functions Date: Sat, 11 Apr 2020 13:40:20 +0000 [thread overview] Message-ID: <f13f9f78cda9d883be7c59417b1da662e02045d6.1586612423.git.gitgitgadget@gmail.com> (raw) In-Reply-To: <pull.603.v3.git.1586612422.gitgitgadget@gmail.com> From: Johannes Schindelin <johannes.schindelin@gmx.de> The `is_hidden` function can be used (only on Windows) to determine whether a directory or file have their `hidden` flag set. This function is duplicated between two test scripts. It is better to move it into `test-lib-functions.sh` so that it is reused. This patch is best viewed with `--color-moved`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> --- t/t0001-init.sh | 7 ------- t/t5611-clone-config.sh | 7 ------- t/test-lib-functions.sh | 7 +++++++ 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/t/t0001-init.sh b/t/t0001-init.sh index 26f82063267..9cc919d8d1a 100755 --- a/t/t0001-init.sh +++ b/t/t0001-init.sh @@ -392,13 +392,6 @@ test_expect_success SYMLINKS 're-init to move gitdir symlink' ' test_path_is_dir realgitdir/refs ' -# Tests for the hidden file attribute on windows -is_hidden () { - # Use the output of `attrib`, ignore the absolute path - case "$(attrib "$1")" in *H*?:*) return 0;; esac - return 1 -} - test_expect_success MINGW '.git hidden' ' rm -rf newdir && ( diff --git a/t/t5611-clone-config.sh b/t/t5611-clone-config.sh index 60c1ba951b7..c861e12ea44 100755 --- a/t/t5611-clone-config.sh +++ b/t/t5611-clone-config.sh @@ -92,13 +92,6 @@ test_expect_success 'clone -c remote.<remote>.fetch=<refspec> --origin=<name>' ' test_cmp expect actual ' -# Tests for the hidden file attribute on windows -is_hidden () { - # Use the output of `attrib`, ignore the absolute path - case "$(attrib "$1")" in *H*?:*) return 0;; esac - return 1 -} - test_expect_success MINGW 'clone -c core.hideDotFiles' ' test_commit attributes .gitattributes "" && rm -rf child && diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index 352c213d52e..7a7e7a38312 100644 --- a/t/test-lib-functions.sh +++ b/t/test-lib-functions.sh @@ -1543,3 +1543,10 @@ test_bitmap_traversal () { test_cmp "$1.normalized" "$2.normalized" && rm -f "$1.normalized" "$2.normalized" } + +# Tests for the hidden file attribute on windows +is_hidden () { + # Use the output of `attrib`, ignore the absolute path + case "$(attrib "$1")" in *H*?:*) return 0;; esac + return 1 +} -- gitgitgadget
next prev parent reply other threads:[~2020-04-11 13:40 UTC|newest] Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-04-08 19:34 [PATCH] mingw: make is_hidden tests in t0001/t5611 more robust Johannes Schindelin via GitGitGadget 2020-04-08 21:59 ` Junio C Hamano 2020-04-09 20:11 ` [PATCH 0/2] make "is_hidden" even " Junio C Hamano 2020-04-09 20:11 ` [PATCH 1/2] mingw: refactor test_path_is_hidden out to t/test-lib-functions.sh Junio C Hamano 2020-04-09 20:11 ` [PATCH 2/2] t: protect against use of test_path_is_hidden outside MINGW Junio C Hamano 2020-04-10 11:03 ` [PATCH v2 0/3] Make the tests that test core.hideDotFiles more robust Johannes Schindelin via GitGitGadget 2020-04-10 11:03 ` [PATCH v2 1/3] t: consolidate the `is_hidden` functions Johannes Schindelin via GitGitGadget 2020-04-10 11:03 ` [PATCH v2 2/3] mingw: make test_path_is_hidden tests in t0001/t5611 more robust Johannes Schindelin via GitGitGadget 2020-04-10 11:03 ` [PATCH v2 3/3] t: fix casing of the operating system `Windows` Johannes Schindelin via GitGitGadget 2020-04-10 11:14 ` [PATCH v2 0/3] Make the tests that test core.hideDotFiles more robust Junio C Hamano 2020-04-11 13:40 ` [PATCH v3 " Johannes Schindelin via GitGitGadget 2020-04-11 13:40 ` Johannes Schindelin via GitGitGadget [this message] 2020-04-11 13:40 ` [PATCH v3 2/3] mingw: make test_path_is_hidden " Johannes Schindelin via GitGitGadget 2020-04-11 13:40 ` [PATCH v3 3/3] t: restrict `is_hidden` to be called only on Windows Johannes Schindelin via GitGitGadget 2020-04-11 21:27 ` [PATCH v3 0/3] Make the tests that test core.hideDotFiles more robust 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=f13f9f78cda9d883be7c59417b1da662e02045d6.1586612423.git.gitgitgadget@gmail.com \ --to=gitgitgadget@gmail.com \ --cc=git@vger.kernel.org \ --cc=johannes.schindelin@gmx.de \ --subject='Re: [PATCH v3 1/3] t: consolidate the `is_hidden` functions' \ /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
Code repositories for project(s) associated with this 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).