From: Luke Diamand <luke@diamand.org>
Date: Wed, 25 Apr 2012 08:16:54 +0000 (+0100)
Subject: git p4: fix unit tests
X-Git-Tag: v1.7.11-rc0~79^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=00855b656bf883c607a4adcd5bc7a76711e4b3a3;p=thirdparty%2Fgit.git

git p4: fix unit tests

The submit-edit tests relied on P4EDITOR being unset. Set it
explicitly to an empty string.

Signed-off-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/t9805-git-p4-skip-submit-edit.sh b/t/t9805-git-p4-skip-submit-edit.sh
index 4a72f79522..353dcfbe09 100755
--- a/t/t9805-git-p4-skip-submit-edit.sh
+++ b/t/t9805-git-p4-skip-submit-edit.sh
@@ -91,7 +91,7 @@ test_expect_success 'no config, edited' '
 		cd "$git" &&
 		echo line >>file1 &&
 		git commit -a -m "change 5" &&
-		EDITOR="\"$ed\"" git p4 submit &&
+		P4EDITOR="" EDITOR="\"$ed\"" git p4 submit &&
 		p4 changes //depot/... >wc &&
 		test_line_count = 5 wc
 	)