git p4: fix unit tests

luked99 · gitster · commit 00855b656bf8 · 2012-04-25T08:19:26.000-07:00
The submit-edit tests relied on P4EDITOR being unset. Set it
explicitly to an empty string.

Signed-off-by: Luke Diamand &lt;luke@diamand.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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
 	)

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ test_expect_success 'no config, edited' '`
`91`	`91`	`cd "$git" &&`
`92`	`92`	`echo line >>file1 &&`
`93`	`93`	`git commit -a -m "change 5" &&`
`94`		`- EDITOR="\"$ed\"" git p4 submit &&`
	`94`	`+ P4EDITOR="" EDITOR="\"$ed\"" git p4 submit &&`
`95`	`95`	`p4 changes //depot/... >wc &&`
`96`	`96`	`test_line_count = 5 wc`
`97`	`97`	`)`