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>
This commit is contained in:
parent
6ab1d76c3c
commit
7bbaf11f35
@ -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 &&
|
||||
|
Loading…
Reference in New Issue
Block a user