From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pete Wyckoff Subject: [PATCH 3/4] git-p4: one test missing config git-p4.skipSubmitEditCheck Date: Sun, 7 Aug 2011 09:35:48 -0400 Message-ID: <20110807133548.GC27737@arf.padd.com> References: <20110807133144.GA27521@arf.padd.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git@vger.kernel.org, Luke Diamand To: Junio C Hamano X-From: git-owner@vger.kernel.org Sun Aug 07 15:35:58 2011 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Qq3WH-0002no-HC for gcvg-git-2@lo.gmane.org; Sun, 07 Aug 2011 15:35:57 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751746Ab1HGNfw (ORCPT ); Sun, 7 Aug 2011 09:35:52 -0400 Received: from honk.padd.com ([74.3.171.149]:57074 "EHLO honk.padd.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751229Ab1HGNfw (ORCPT ); Sun, 7 Aug 2011 09:35:52 -0400 Received: from arf.padd.com (unknown [50.52.168.230]) by honk.padd.com (Postfix) with ESMTPSA id C885B1F9E; Sun, 7 Aug 2011 06:35:51 -0700 (PDT) Received: by arf.padd.com (Postfix, from userid 7770) id 8CA463143E; Sun, 7 Aug 2011 09:35:48 -0400 (EDT) Content-Disposition: inline In-Reply-To: <20110807133144.GA27521@arf.padd.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: 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 --- t/t9800-git-p4.sh | 1 + 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 " -m "perms: a change by alice" file1 && ! P4EDITOR=touch P4USER=bob P4PASSWD=secret "$GITP4" commit --preserve-user && -- 1.7.5.4