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 <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Luke Diamand committed
Apr 11, 2012 at 17:21 UTC
7bbaf11f356c7ae731ed33e157f1fbe1a75aa6f0
1 file changed
+2
-2
t/t9800-git-p4-basic.sh
+2
-2
@@ -335,7 +335,7 @@ test_expect_success 'detect renames' '
335
test_when_finished cleanup_git &&
336
(
337
cd "$git" &&
338
- git config git-p4.skipSubmitEditCheck true &&
338
+ git config git-p4.skipSubmitEdit true &&
339
340
git mv file1 file4 &&
341
git commit -a -m "Rename file1 to file4" &&
@@ -394,7 +394,7 @@ test_expect_success 'detect copies' '
394
test_when_finished cleanup_git &&
395
(
396
cd "$git" &&
397
- git config git-p4.skipSubmitEditCheck true &&
397
+ git config git-p4.skipSubmitEdit true &&
398
399
cp file2 file8 &&
400
git add file8 &&