summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorPete Wyckoff <pw@padd.com>2011-07-31 13:45:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-08-01 17:24:15 (GMT)
commiteab30818a9d0b874f9b339374349043f2c4aee5d (patch)
tree057dbf715b9d0bac1203e93b348fa91adc8137f3 /t
parent83cf0fe49fc6a7124377ef6dec75a9776c753346 (diff)
downloadgit-eab30818a9d0b874f9b339374349043f2c4aee5d.zip
git-eab30818a9d0b874f9b339374349043f2c4aee5d.tar.gz
git-eab30818a9d0b874f9b339374349043f2c4aee5d.tar.bz2
git-p4: one test missing config git-p4.skipSubmitEditCheck
Add this missing line in one of the tests. Otherwise, on fast machines, the following git-p4 commit will complain that nobody edited the submission message. Signed-off-by: Pete Wyckoff <pw@padd.com> Acked-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t9800-git-p4.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t9800-git-p4.sh b/t/t9800-git-p4.sh
index b7eda82..b304707 100755
--- a/t/t9800-git-p4.sh
+++ b/t/t9800-git-p4.sh
@@ -191,6 +191,7 @@ test_expect_success 'refuse to preserve users without perms' '
"$GITP4" clone --dest="$git" //depot &&
test_when_finished cleanup_git &&
cd "$git" &&
+ git config git-p4.skipSubmitEditCheck true &&
echo "username-noperms: a change by alice" >> file1 &&
git commit --author "Alice <alice@localhost>" -m "perms: a change by alice" file1 &&
! P4EDITOR=touch P4USER=bob P4PASSWD=secret "$GITP4" commit --preserve-user &&