Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git p4: Fixing script editor checks
author
Luke Diamand
<luke@diamand.org>
Wed, 11 Apr 2012 15:21:23 +0000
(17:21 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 11 Apr 2012 18:04:51 +0000
(11:04 -0700)
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>
t/t9800-git-p4-basic.sh
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
6ab1d76
)
diff --git
a/t/t9800-git-p4-basic.sh
b/t/t9800-git-p4-basic.sh
index 13be144459c7fd6baeb7afeece5dde940097cb43..b2f08697ad88332f092c26e99d950cfd89864bb7 100755
(executable)
--- 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.skipSubmitEdit
Check
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.skipSubmitEdit
Check
true &&
+ git config git-p4.skipSubmitEdit true &&
cp file2 file8 &&
git add file8 &&