git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCHv1] git p4: fix for submit/edit unit test
@ 2012-04-25  8:16 Luke Diamand
  2012-04-25  8:16 ` [PATCH] git p4: fix unit tests Luke Diamand
  2012-04-25 15:18 ` [PATCHv1] git p4: fix for submit/edit unit test Junio C Hamano
  0 siblings, 2 replies; 3+ messages in thread
From: Luke Diamand @ 2012-04-25  8:16 UTC (permalink / raw)
  To: git; +Cc: Junio C Hamano, Pete Wyckoff, Luke Diamand

My P4EDITOR changes broke the submit/edit "git p4" unit test.
This fixes it.

Junio - would you prefer me to resubmit the entire series?

Thanks
Luke


Luke Diamand (1):
  git p4: fix unit tests

 t/t9805-git-p4-skip-submit-edit.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
1.7.10.473.g0796

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH] git p4: fix unit tests
  2012-04-25  8:16 [PATCHv1] git p4: fix for submit/edit unit test Luke Diamand
@ 2012-04-25  8:16 ` Luke Diamand
  2012-04-25 15:18 ` [PATCHv1] git p4: fix for submit/edit unit test Junio C Hamano
  1 sibling, 0 replies; 3+ messages in thread
From: Luke Diamand @ 2012-04-25  8:16 UTC (permalink / raw)
  To: git; +Cc: Junio C Hamano, Pete Wyckoff, Luke Diamand

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

Signed-off-by: Luke Diamand <luke@diamand.org>
---
 t/t9805-git-p4-skip-submit-edit.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/t/t9805-git-p4-skip-submit-edit.sh b/t/t9805-git-p4-skip-submit-edit.sh
index 4a72f79..353dcfb 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
 	)
-- 
1.7.10.473.g0796

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCHv1] git p4: fix for submit/edit unit test
  2012-04-25  8:16 [PATCHv1] git p4: fix for submit/edit unit test Luke Diamand
  2012-04-25  8:16 ` [PATCH] git p4: fix unit tests Luke Diamand
@ 2012-04-25 15:18 ` Junio C Hamano
  1 sibling, 0 replies; 3+ messages in thread
From: Junio C Hamano @ 2012-04-25 15:18 UTC (permalink / raw)
  To: Luke Diamand; +Cc: git, Pete Wyckoff

Luke Diamand <luke@diamand.org> writes:

> My P4EDITOR changes broke the submit/edit "git p4" unit test.
> This fixes it.
>
> Junio - would you prefer me to resubmit the entire series?

It is too late for replacement, as the series is in 'next'.  Incremental
updates like you did is good.

Thanks.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2012-04-25 15:19 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-25  8:16 [PATCHv1] git p4: fix for submit/edit unit test Luke Diamand
2012-04-25  8:16 ` [PATCH] git p4: fix unit tests Luke Diamand
2012-04-25 15:18 ` [PATCHv1] git p4: fix for submit/edit unit test Junio C Hamano

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).