summaryrefslogtreecommitdiff
path: root/t/t9800-git-p4-basic.sh
diff options
context:
space:
mode:
authorLuke Diamand <luke@diamand.org>2012-04-11 17:21:23 +0200
committerJunio C Hamano <gitster@pobox.com>2012-04-11 11:04:51 -0700
commit7bbaf11f356c7ae731ed33e157f1fbe1a75aa6f0 (patch)
tree3f4567d1766285724aa5d665b179dab851c72ba8 /t/t9800-git-p4-basic.sh
parent6ab1d76c3cf96aac77a75565dfaa0cf64aa100a1 (diff)
downloadgit-7bbaf11f356c7ae731ed33e157f1fbe1a75aa6f0.tar.gz
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>
Diffstat (limited to 't/t9800-git-p4-basic.sh')
-rwxr-xr-xt/t9800-git-p4-basic.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh
index 13be144459..b2f08697ad 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 &&