[PATCHv4 1/5] git p4: Fixing script editor checks
- From
Luke Diamand <luke@diamand.org>
- Date
- Apr 24, 2012, 08:33 UTC
- Message-ID
- <1335256403-22162-2-git-send-email-luke@diamand.org>
- In-Reply-To
- <1335256403-22162-1-git-send-email-luke@diamand.org>
If P4EDITOR is defined, the tests will fail when "git p4" starts an editor.
Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> --- 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 &&
-- 1.7.10.8.g12781