test-vc-list-files-git: make more robust

Unset GIT_DIR and GIT_WORK_TREE environment variables to avoid
testing the wrong location.

* tests/test-vc-list-files-git.sh: Unset problematic environment
variables.  Chain commands together.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index 2095b2f..568507f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-03-17  Bert Wesarg  <bert.wesarg@googlemail.com>  (tiny change)
+       and Eric Blake  <eblake@redhat.com>
+
+       test-vc-list-files-git: make more robust
+       * tests/test-vc-list-files-git.sh: Unset problematic environment
+       variables.  Chain commands together.
+
 2010-03-17  Ludovic Courtès <ludo@gnu.org>  (tiny change)
 
        * m4/pty.m4: Unset $ac_cv_have_decl_forkpty before the second

diff --git a/tests/test-vc-list-files-git.sh b/tests/test-vc-list-files-git.sh
index 7b7ff1a..56a9a5b 100755 (executable)
--- a/tests/test-vc-list-files-git.sh
+++ b/tests/test-vc-list-files-git.sh
@@ -28,6 +28,8 @@ tmpdir=vc-git-$$
 trap 'st=$?; cd '"`pwd`"' && rm -rf $tmpdir; exit $st' 0
 trap '(exit $?); exit $?' 1 2 13 15
 
+GIT_DIR= GIT_WORK_TREE=; unset GIT_DIR GIT_WORK_TREE
+
 fail=1
 mkdir $tmpdir && cd $tmpdir &&
   # without git, skip the test
@@ -36,8 +38,8 @@ mkdir $tmpdir && cd $tmpdir &&
     || { echo "Skipping test: git not found in PATH"; (exit 77); exit 77; }; } &&
   mkdir d &&
   touch d/a b c &&
-  git config user.email "you@example.com"
-  git config user.name "Your Name"
+  git config user.email "you@example.com" &&
+  git config user.name "Your Name" &&
   git add . > /dev/null &&
   git commit -q -a -m log &&
   printf '%s\n' b c d/a > expected &&