Skip to content

Commit 7bbaf11

Browse files
luked99gitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 6ab1d76 commit 7bbaf11

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

t/t9800-git-p4-basic.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ test_expect_success 'detect renames' '
335335
test_when_finished cleanup_git &&
336336
(
337337
cd "$git" &&
338-
git config git-p4.skipSubmitEditCheck true &&
338+
git config git-p4.skipSubmitEdit true &&
339339
340340
git mv file1 file4 &&
341341
git commit -a -m "Rename file1 to file4" &&
@@ -394,7 +394,7 @@ test_expect_success 'detect copies' '
394394
test_when_finished cleanup_git &&
395395
(
396396
cd "$git" &&
397-
git config git-p4.skipSubmitEditCheck true &&
397+
git config git-p4.skipSubmitEdit true &&
398398
399399
cp file2 file8 &&
400400
git add file8 &&

0 commit comments

Comments
 (0)