From mboxrd@z Thu Jan 1 00:00:00 1970 From: Don Slutz Subject: (unknown) Date: Mon, 11 May 2009 14:57:12 -0400 Message-ID: <200905111857.n4BIvCcb002315@krl.krl.com> To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Mon May 11 21:25:34 2009 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1M3b80-0005Ox-BG for gcvg-git-2@gmane.org; Mon, 11 May 2009 21:25:32 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754204AbZEKTZX (ORCPT ); Mon, 11 May 2009 15:25:23 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758225AbZEKTZV (ORCPT ); Mon, 11 May 2009 15:25:21 -0400 Received: from krl.krl.com ([192.147.32.3]:42939 "EHLO krl.krl.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755058AbZEKTZS (ORCPT ); Mon, 11 May 2009 15:25:18 -0400 X-Greylist: delayed 1681 seconds by postgrey-1.27 at vger.kernel.org; Mon, 11 May 2009 15:25:15 EDT Received: from krl.krl.com (localhost [127.0.0.1]) by krl.krl.com (8.13.1/8.13.1) with ESMTP id n4BIvD6g002327 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 11 May 2009 14:57:13 -0400 Received: (from slutz@localhost) by krl.krl.com (8.13.1/8.13.1/Submit) id n4BIvCcb002315 for git@vger.kernel.org; Mon, 11 May 2009 14:57:12 -0400 X-Virus-Scanned: ClamAV version 0.94.2, clamav-milter version 0.94.2 on krl X-Virus-Status: Clean Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: >>From 96f9b68bba7ad2ec2c9623709b417f27c2831790 Mon Sep 17 00:00:00 2001 From: Don Slutz Date: Fri, 1 May 2009 15:32:18 -0400 Subject: [PATCH 1/6] Add core.autocrlf=true on cygwin by default during tests It can be disabled or enabled by using the GIT_TEST_AUTO_CRLF environment variable. Signed-off-by: Don Slutz --- t/test-lib.sh | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/t/test-lib.sh b/t/test-lib.sh index dad1437..218bd82 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -119,6 +119,17 @@ do esac done +# Switch to core.autolf = true on cygwin but only by default +case $(uname -s) in +*CYGWIN*) + GIT_TEST_AUTO_CRLF=${GIT_TEST_AUTO_CRLF:-true} + test "$debug" = "" || + echo "Test in mode" $(cygpath --mode . | cut -d: -f2-) "mount" + ;; +*) + ;; +esac + if test -n "$color"; then say_color () { ( @@ -493,6 +504,11 @@ test_create_repo () { cd "$repo" || error "Cannot setup test environment" "$GIT_EXEC_PATH/git-init" "--template=$TEST_DIRECTORY/../templates/blt/" >&3 2>&4 || error "cannot run git init -- have you built things yet?" + test ! -z "$GIT_TEST_AUTO_CRLF" && + test_debug "echo Switching to autocrlf=$GIT_TEST_AUTO_CRLF" && { + git config core.autocrlf $GIT_TEST_AUTO_CRLF || + error "Failed to switch to autocrlf=$GIT_TEST_AUTO_CRLF" + } mv .git/hooks .git/hooks-disabled cd "$owd" } -- 1.6.3.15.g49878