diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-05-26 13:17:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-26 13:17:21 -0700 |
| commit | 1f62b9256da9de99cef93b31a22d63e4ebf1a1d6 (patch) | |
| tree | 212c807ffca8a09c05244888cbcaa100a9ebd74b /t | |
| parent | Merge branch 'va/i18n-misc-updates' into maint (diff) | |
| parent | t6041: do not compress backup tar file (diff) | |
| download | tgif-1f62b9256da9de99cef93b31a22d63e4ebf1a1d6.tar.xz | |
Merge branch 'sb/z-is-gnutar-ism' into maint
Test fix.
* sb/z-is-gnutar-ism:
t6041: do not compress backup tar file
t3513: do not compress backup tar file
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 a1c4e0216f..db9378142a 100755 --- a/t/t3513-revert-submodule.sh +++ b/t/t3513-revert-submodule.sh @@ -14,11 +14,11 @@ test_description='revert can handle submodules' git_revert () { git status -su >expect && ls -1pR * >>expect && - tar czf "$TRASH_DIRECTORY/tmp.tgz" * && + tar cf "$TRASH_DIRECTORY/tmp.tar" * && git checkout "$1" && git revert HEAD && rm -rf * && - tar xzf "$TRASH_DIRECTORY/tmp.tgz" && + 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 c6b7aa6977..62b8a2e7bb 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 czf "$TRASH_DIRECTORY/tmp.tgz" * && + tar cf "$TRASH_DIRECTORY/tmp.tar" * && GOOD=$(git rev-parse --verify HEAD) && git checkout "$1" && echo "foo" >bar && @@ -20,7 +20,7 @@ git_bisect () { git bisect start && git bisect good $GOOD && rm -rf * && - tar xzf "$TRASH_DIRECTORY/tmp.tgz" && + tar xf "$TRASH_DIRECTORY/tmp.tar" && git status -su >actual && ls -1pR * >>actual && test_cmp expect actual && |