Browse Source

Merge branch 'sb/z-is-gnutar-ism'

* sb/z-is-gnutar-ism:
  t6041: do not compress backup tar file
  t3513: do not compress backup tar file
maint
Junio C Hamano 9 years ago
parent
commit
2049e7e19a
  1. 4
      t/t3513-revert-submodule.sh
  2. 4
      t/t6041-bisect-submodule.sh

4
t/t3513-revert-submodule.sh

@ -14,11 +14,11 @@ test_description='revert can handle submodules' @@ -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 &&

4
t/t6041-bisect-submodule.sh

@ -8,7 +8,7 @@ test_description='bisect can handle submodules' @@ -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 () { @@ -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 &&

Loading…
Cancel
Save