aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Diamand <luke@diamand.org>2012-04-24 09:33:20 +0100
committerJunio C Hamano <gitster@pobox.com>2012-04-24 14:22:19 -0700
commit1e3e7180a1bc0c7af7ad8ccaa45467f6ee92f2bd (patch)
tree11b6776a1ebd8208aa31d255f487e33fe2c28e8b
parentc8942a223d41adab336946913f28cf8691ee479a (diff)
downloadgit-1e3e7180a1bc0c7af7ad8ccaa45467f6ee92f2bd.tar.gz
git-1e3e7180a1bc0c7af7ad8ccaa45467f6ee92f2bd.tar.xz
git p4: Squash P4EDITOR in test harness
If P4EDITOR is set in the environment, test behavior could be unpredictable. Set it explicitly. Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--t/lib-git-p4.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh
index b90986c2c..121e38002 100644
--- a/t/lib-git-p4.sh
+++ b/t/lib-git-p4.sh
@@ -24,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"