Merge branch 'mm/config-xdg'

diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh
index a870f9a5d280e3809267b5970f8b9372b5d260b1..121e38002bc73807649ebcc5df2799f6f35a9c67 100644 (file)
--- a/t/lib-git-p4.sh
+++ b/t/lib-git-p4.sh
@@ -1,20 +1,18 @@
 #
-# Library code for git-p4 tests
+# Library code for git p4 tests
 #
 
 . ./test-lib.sh
 
 if ! test_have_prereq PYTHON; then
-       skip_all='skipping git-p4 tests; python not available'
+       skip_all='skipping git p4 tests; python not available'
        test_done
 fi
 ( p4 -h && p4d -h ) >/dev/null 2>&1 || {
-       skip_all='skipping git-p4 tests; no p4 or p4d'
+       skip_all='skipping git p4 tests; no p4 or p4d'
        test_done
 }
 
-GITP4="$GIT_BUILD_DIR/contrib/fast-import/git-p4"
-
 # Try to pick a unique port: guess a large number, then hope
 # no more than one of each test is running.
 #
@@ -26,6 +24,7 @@ P4DPORT=$((10669 + ($testid - $git_p4_test_start)))
 
 export P4PORT=localhost:$P4DPORT
 export P4CLIENT=client
+export P4EDITOR=:
 
 db="$TRASH_DIRECTORY/db"
 cli="$TRASH_DIRECTORY/cli"