Re: [PATCHv2 1/2] git p4: Fixing script editor checks

2 messages, 2 authors, 2016-06-15 · open the first message on its own page

Re: [PATCHv2 1/2] git p4: Fixing script editor checks

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:53:33

Luke Diamand [off-list ref] writes:
If P4EDITOR is defined, the tests will fail when "git p4" starts an
editor.
Is that a problem specific to tests, or should "git p4" itself unset that
environment?  If it is a problem specific to tests, would it be a better
fix to add "P4EDITOR=:" like we do for EDITOR in t/test-lib.sh?
quoted hunk
Signed-off-by: Luke Diamand <redacted>
---
 t/t9800-git-p4-basic.sh |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh
index 13be144..b2f0869 100755
--- a/t/t9800-git-p4-basic.sh
+++ b/t/t9800-git-p4-basic.sh
@@ -335,7 +335,7 @@ test_expect_success 'detect renames' '
 	test_when_finished cleanup_git &&
 	(
 		cd "$git" &&
-		git config git-p4.skipSubmitEditCheck true &&
+		git config git-p4.skipSubmitEdit true &&
 
 		git mv file1 file4 &&
 		git commit -a -m "Rename file1 to file4" &&
@@ -394,7 +394,7 @@ test_expect_success 'detect copies' '
 	test_when_finished cleanup_git &&
 	(
 		cd "$git" &&
-		git config git-p4.skipSubmitEditCheck true &&
+		git config git-p4.skipSubmitEdit true &&
 
 		cp file2 file8 &&
 		git add file8 &&

Re: [PATCHv2 1/2] git p4: Fixing script editor checks

From: Luke Diamand <hidden>
Date: 2016-06-15 22:53:33

On Wed, Apr 11, 2012 at 7:14 PM, Junio C Hamano [off-list ref] wrote:
Luke Diamand [off-list ref] writes:
quoted
If P4EDITOR is defined, the tests will fail when "git p4" starts an
editor.
Is that a problem specific to tests, or should "git p4" itself unset that
environment?  If it is a problem specific to tests, would it be a better
fix to add "P4EDITOR=:" like we do for EDITOR in t/test-lib.sh?
Yes and no - git-p4.py will run $P4EDITOR if it is set, even if it's
just empty. So it would need a small fix to check for an empty string.
I can submit a suitable patch.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help