diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-04-11 13:40:20 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-04-11 14:23:23 -0700 |
| commit | 7c2dfca7e81538b3d979b85b5bd023358d4d79eb (patch) | |
| tree | 703826db47c1ac9b73d1802a4ccc0df8f12f8f04 | |
| parent | Merge branch 'ds/default-pack-use-sparse-to-true' (diff) | |
| download | tgif-7c2dfca7e81538b3d979b85b5bd023358d4d79eb.tar.xz | |
t: consolidate the `is_hidden` functions
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t0001-init.sh | 7 | ||||
| -rwxr-xr-x | t/t5611-clone-config.sh | 7 | ||||
| -rw-r--r-- | 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 26f8206326..9cc919d8d1 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 60c1ba951b..c861e12ea4 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 352c213d52..7a7e7a3831 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 +} |