[PATCH v3 1/3] t: consolidate the `is_hidden` functions
- From
Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Apr 11, 2020, 13:40 UTC
- Message-ID
- <f13f9f78cda9d883be7c59417b1da662e02045d6.1586612423.git.gitgitgadget@gmail.com>
- 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