undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Test fix.

* sb/z-is-gnutar-ism:
  t6041: do not compress backup tar file
  t3513: do not compress backup tar file
This commit is contained in:
Junio C Hamano 2016-05-26 13:17:21 -07:00
commit 1f62b9256d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
t/t3513-revert-submodule.sh
View File

@ -14,11 +14,11 @@ test_description='revert can handle submodules'
git_revert () { git_revert () {
git status -su >expect && git status -su >expect &&
ls -1pR * >>expect && ls -1pR * >>expect &&
tar czf "$TRASH_DIRECTORY/tmp.tgz" * && tar cf "$TRASH_DIRECTORY/tmp.tar" * &&
git checkout "$1" && git checkout "$1" &&
git revert HEAD && git revert HEAD &&
rm -rf * && rm -rf * &&
tar xzf "$TRASH_DIRECTORY/tmp.tgz" && tar xf "$TRASH_DIRECTORY/tmp.tar" &&
git status -su >actual && git status -su >actual &&
ls -1pR * >>actual && ls -1pR * >>actual &&
test_cmp expect actual && test_cmp expect actual &&

4
t/t6041-bisect-submodule.sh
View File

@ -8,7 +8,7 @@ test_description='bisect can handle submodules'
git_bisect () { git_bisect () {
git status -su >expect && git status -su >expect &&
ls -1pR * >>expect && ls -1pR * >>expect &&
tar czf "$TRASH_DIRECTORY/tmp.tgz" * && tar cf "$TRASH_DIRECTORY/tmp.tar" * &&
GOOD=$(git rev-parse --verify HEAD) && GOOD=$(git rev-parse --verify HEAD) &&
git checkout "$1" && git checkout "$1" &&
echo "foo" >bar && echo "foo" >bar &&
@ -20,7 +20,7 @@ git_bisect () {
git bisect start && git bisect start &&
git bisect good $GOOD && git bisect good $GOOD &&
rm -rf * && rm -rf * &&
tar xzf "$TRASH_DIRECTORY/tmp.tgz" && tar xf "$TRASH_DIRECTORY/tmp.tar" &&
git status -su >actual && git status -su >actual &&
ls -1pR * >>actual && ls -1pR * >>actual &&
test_cmp expect actual && test_cmp expect actual &&