Skip to content

Commit

Permalink
git p4: Fixing script editor checks
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Luke Diamand authored and Junio C Hamano committed Apr 11, 2012
1 parent 6ab1d76 commit 7bbaf11
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions t/t9800-git-p4-basic.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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" &&
Expand Down Expand Up @@ -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 &&
Expand Down

0 comments on commit 7bbaf11

Please sign in to comment.