From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Stefan-W. Hahn" Subject: [PATCH 3/3] Adding test for `--keep-cr` for git-am. Date: Sat, 13 Feb 2010 17:59:22 +0100 Message-ID: <1266080362-24760-4-git-send-email-stefan.hahn@s-hahn.de> References: <1266080362-24760-1-git-send-email-stefan.hahn@s-hahn.de> Cc: "Stefan-W. Hahn" To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sat Feb 13 18:20:32 2010 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 1NgLfT-0003qK-Iw for gcvg-git-2@lo.gmane.org; Sat, 13 Feb 2010 18:20:31 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757131Ab0BMRUF (ORCPT ); Sat, 13 Feb 2010 12:20:05 -0500 Received: from moutng.kundenserver.de ([212.227.17.10]:54164 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754086Ab0BMRUE (ORCPT ); Sat, 13 Feb 2010 12:20:04 -0500 Received: from scotty.home (port-92-203-27-201.dynamic.qsc.de [92.203.27.201]) by mrelayeu.kundenserver.de (node=mrbap1) with ESMTP (Nemesis) id 0Lkzrh-1OEZx00Ujd-00adue; Sat, 13 Feb 2010 18:20:03 +0100 Received: from scotty.home (smmsp@localhost [127.0.0.1]) by scotty.home (8.14.3/8.14.3/Debian-5) with ESMTP id o1DHK1YL026401 for ; Sat, 13 Feb 2010 18:20:02 +0100 Received: (from hs@localhost) by scotty.home (8.14.3/8.14.3/Submit) id o1DH0kko025113; Sat, 13 Feb 2010 18:00:46 +0100 X-Mailer: git-send-email 1.7.0.rc2.31.g49e2a In-Reply-To: <1266080362-24760-1-git-send-email-stefan.hahn@s-hahn.de> X-Spam-Status: No, score=-1.4 required=5.0 tests=ALL_TRUSTED autolearn=failed version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on scotty.home X-Virus-Scanned: clamav-milter 0.95.3 at scotty X-Virus-Status: Clean X-Provags-ID: V01U2FsdGVkX1/0ewNBUlc9cAa9qI5HhT8zuzKVa44uXQLp8IB T+u7KBWYBBkz3IdmQn40K6SNGh/JKPzfAkZ7ttNJx2lPfMjQv0 ot6kq180kOPCUg+WYPHxA== Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: This test adds test for git-am dos line endings, the command sequence 'git format-patch ... | git am ...' and the configuration variable `am.keepcr`. Signed-off-by: Stefan-W. Hahn --- t/t4253-am-keep-cr-dos.sh | 68 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) create mode 100644 t/t4253-am-keep-cr-dos.sh diff --git a/t/t4253-am-keep-cr-dos.sh b/t/t4253-am-keep-cr-dos.sh new file mode 100644 index 0000000..a4f5f80 --- /dev/null +++ b/t/t4253-am-keep-cr-dos.sh @@ -0,0 +1,68 @@ +#!/bin/sh +# +# Copyright (c) 2010 Stefan-W. Hahn +# + +test_description='git-am mbox with dos line ending. + +' +. ./test-lib.sh + +# Three patches which will be added as files with dos line ending. + +cat > file1 <<\EOF +line 1 +EOF + +cat > file2 <<\EOF +line 1 +line 2 +EOF + +cat > file3 <<\EOF +line 1 +line 2 +line 3 +EOF + +test_expect_success 'setup repository with dos files' ' + append_cr file + git add file && + git commit -m Initial && + git tag start && + append_cr file + git commit -a -m Second && + git tag start2 && + append_cr file + git commit -a -m Third && + git format-patch -k --stdout start.. > format-patch.diff +' + +test_expect_success 'mailsplit format-patch of dos files' ' + mkdir split && + git mailsplit -osplit format-patch.diff && + cat split/0001 split/0002 > mailsplit.diff && + test_must_fail test_cmp format-patch.diff mailsplit.diff +' + +test_expect_success 'mailsplit --keep-cr format-patch of dos files' ' + mkdir split2 && + git mailsplit --keep-cr -osplit2 format-patch.diff && + cat split2/0001 split2/0002 > mailsplit2.diff && + test_cmp format-patch.diff mailsplit2.diff +' + +test_expect_success 'format-patch with dos files --keep-cr' ' + git checkout -b new start && + git format-patch -k --stdout start..master | git am --keep-cr -k -3 && + git diff master +' + +test_expect_success 'format-patch with dos files config.mailsplit' ' + git config am.keepcr 1 && + git checkout -b new3 start && + git format-patch -k --stdout start..master | git am -k -3 && + git diff master +' + +test_done -- 1.7.0.rc2.31.g49e2a