diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-06-14 13:33:28 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-06-14 13:33:28 +0900 |
| commit | c189dba20e6d94e4408bcc6ad298f0c157f05b43 (patch) | |
| tree | 4cb3d1a1db0f954b8184cb4dd79383d44890fcc8 /t | |
| parent | Merge branch 'ps/rev-list-object-type-filter' (diff) | |
| parent | t: use configured TAR instead of tar (diff) | |
| download | tgif-c189dba20e6d94e4408bcc6ad298f0c157f05b43.tar.xz | |
Merge branch 'dd/honor-users-tar-in-tests'
Test portability fix.
* dd/honor-users-tar-in-tests:
t: use configured TAR instead of tar
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3513-revert-submodule.sh | 4 | ||||
| -rwxr-xr-x | t/t6041-bisect-submodule.sh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/t/t3513-revert-submodule.sh b/t/t3513-revert-submodule.sh index 74cd96e582..8bfe3ed246 100755 --- a/t/t3513-revert-submodule.sh +++ b/t/t3513-revert-submodule.sh @@ -14,7 +14,7 @@ test_description='revert can handle submodules' git_revert () { git status -su >expect && ls -1pR * >>expect && - tar cf "$TRASH_DIRECTORY/tmp.tar" * && + "$TAR" cf "$TRASH_DIRECTORY/tmp.tar" * && may_only_be_test_must_fail "$2" && $2 git checkout "$1" && if test -n "$2" @@ -23,7 +23,7 @@ git_revert () { fi && git revert HEAD && rm -rf * && - tar xf "$TRASH_DIRECTORY/tmp.tar" && + "$TAR" xf "$TRASH_DIRECTORY/tmp.tar" && git status -su >actual && ls -1pR * >>actual && test_cmp expect actual && diff --git a/t/t6041-bisect-submodule.sh b/t/t6041-bisect-submodule.sh index df1eff0fb8..82013fc903 100755 --- a/t/t6041-bisect-submodule.sh +++ b/t/t6041-bisect-submodule.sh @@ -8,7 +8,7 @@ test_description='bisect can handle submodules' git_bisect () { git status -su >expect && ls -1pR * >>expect && - tar cf "$TRASH_DIRECTORY/tmp.tar" * && + "$TAR" cf "$TRASH_DIRECTORY/tmp.tar" * && GOOD=$(git rev-parse --verify HEAD) && may_only_be_test_must_fail "$2" && $2 git checkout "$1" && @@ -25,7 +25,7 @@ git_bisect () { git bisect start && git bisect good $GOOD && rm -rf * && - tar xf "$TRASH_DIRECTORY/tmp.tar" && + "$TAR" xf "$TRASH_DIRECTORY/tmp.tar" && git status -su >actual && ls -1pR * >>actual && test_cmp expect actual && |