From 1e3e7180a1bc0c7af7ad8ccaa45467f6ee92f2bd Mon Sep 17 00:00:00 2001
From: Luke Diamand <luke@diamand.org>
Date: Tue, 24 Apr 2012 09:33:20 +0100
Subject: [PATCH] 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>
---
 t/lib-git-p4.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh
index b90986c2c9..121e38002b 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"
-- 
2.11.4.GIT