From: Luke Diamand Date: Wed, 11 Apr 2012 15:21:23 +0000 (+0200) Subject: git p4: Fixing script editor checks X-Git-Tag: v1.7.11-rc0~26^2~9 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7bbaf11f356c7ae731ed33e157f1fbe1a75aa6f0;p=git.git git p4: Fixing script editor checks If P4EDITOR is defined, the tests will fail when "git p4" starts an editor. Signed-off-by: Luke Diamand Signed-off-by: Junio C Hamano --- diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh index 13be14445..b2f08697a 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 &&