Skip to content

Commit 1f62b92

Browse files
committed
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
2 parents b262b8f + f5ee54a commit 1f62b92

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

t/t3513-revert-submodule.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ test_description='revert can handle submodules'
1414
git_revert () {
1515
git status -su >expect &&
1616
ls -1pR * >>expect &&
17-
tar czf "$TRASH_DIRECTORY/tmp.tgz" * &&
17+
tar cf "$TRASH_DIRECTORY/tmp.tar" * &&
1818
git checkout "$1" &&
1919
git revert HEAD &&
2020
rm -rf * &&
21-
tar xzf "$TRASH_DIRECTORY/tmp.tgz" &&
21+
tar xf "$TRASH_DIRECTORY/tmp.tar" &&
2222
git status -su >actual &&
2323
ls -1pR * >>actual &&
2424
test_cmp expect actual &&

t/t6041-bisect-submodule.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ test_description='bisect can handle submodules'
88
git_bisect () {
99
git status -su >expect &&
1010
ls -1pR * >>expect &&
11-
tar czf "$TRASH_DIRECTORY/tmp.tgz" * &&
11+
tar cf "$TRASH_DIRECTORY/tmp.tar" * &&
1212
GOOD=$(git rev-parse --verify HEAD) &&
1313
git checkout "$1" &&
1414
echo "foo" >bar &&
@@ -20,7 +20,7 @@ git_bisect () {
2020
git bisect start &&
2121
git bisect good $GOOD &&
2222
rm -rf * &&
23-
tar xzf "$TRASH_DIRECTORY/tmp.tgz" &&
23+
tar xf "$TRASH_DIRECTORY/tmp.tar" &&
2424
git status -su >actual &&
2525
ls -1pR * >>actual &&
2626
test_cmp expect actual &&

0 commit comments

Comments
 (0)