Merge branch 'mv/parseopt-checkout-index'

diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index 33cde705953acc9a30d8535da77fe0f90e2b3118..f0edbf1a76739177943006461b853ec17e8bbb2b 100755 (executable)
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -625,7 +625,7 @@ esac
 # Name and email: C O Mitter <committer@example.com>
 # No password given, to enable non-interactive operation.
 
-cp -R ../t7004 ./gpghome
+cp -R "$TEST_DIRECTORY"/t7004 ./gpghome
 chmod 0700 gpghome
 GNUPGHOME="$(pwd)/gpghome"
 export GNUPGHOME