From eab30818a9d0b874f9b339374349043f2c4aee5d Mon Sep 17 00:00:00 2001 From: Pete Wyckoff Date: Sun, 31 Jul 2011 09:45:38 -0400 Subject: [PATCH] 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 Acked-by: Luke Diamand Signed-off-by: Junio C Hamano --- t/t9800-git-p4.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/t/t9800-git-p4.sh b/t/t9800-git-p4.sh index b7eda82894..b3047077e9 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 " -m "perms: a change by alice" file1 && ! P4EDITOR=touch P4USER=bob P4PASSWD=secret "$GITP4" commit --preserve-user && -- 2.11.4.GIT