From mboxrd@z Thu Jan 1 00:00:00 1970 From: Axel Bonnet Subject: [RFC/PATCH 4/4] t/t8006: test textconv support for blame Date: Thu, 3 Jun 2010 12:47:18 +0200 Message-ID: <1275562038-7468-5-git-send-email-axel.bonnet@ensimag.imag.fr> References: <1275562038-7468-1-git-send-email-axel.bonnet@ensimag.imag.fr> <1275562038-7468-2-git-send-email-axel.bonnet@ensimag.imag.fr> <1275562038-7468-3-git-send-email-axel.bonnet@ensimag.imag.fr> <1275562038-7468-4-git-send-email-axel.bonnet@ensimag.imag.fr> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=ISO-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Axel Bonnet , Diane Gasselin , =?UTF-8?q?Cl=C3=A9ment=20Poulain?= To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Thu Jun 03 13:12:02 2010 connect(): No such file or directory 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 1OK8L8-0006Qa-F7 for gcvg-git-2@lo.gmane.org; Thu, 03 Jun 2010 13:11:58 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932366Ab0FCLLu (ORCPT ); Thu, 3 Jun 2010 07:11:50 -0400 X-Warning: Original message contained 8-bit characters, however during the SMTP transport session the receiving system did not announce capability of receiving 8-bit SMTP (RFC 1651-1653), and as this message does not have MIME headers (RFC 2045-2049) to enable encoding change, we had very little choice. X-Warning: We ASSUME it is less harmful to add the MIME headers, and convert the text to Quoted-Printable, than not to do so, and to strip the message to 7-bits.. (RFC 1428 Appendix A) X-Warning: We don't know what character set the user used, thus we had to write these MIME-headers with our local system default value. Received: from mx1.imag.fr ([129.88.30.5]:35231 "EHLO shiva.imag.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932246Ab0FCLLt (ORCPT ); Thu, 3 Jun 2010 07:11:49 -0400 Received: from ensikerberos.imag.fr (ensimag.imag.fr [195.221.228.12]) by shiva.imag.fr (8.13.8/8.13.8) with ESMTP id o53AfMax028121 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 3 Jun 2010 12:41:22 +0200 Received: from ensibm.imag.fr (ensibm.imag.fr [195.221.228.8]) by ensikerberos.imag.fr (8.13.8/8.13.8/ImagV2.1.r_ens) with ESMTP id o53Amk03023215; Thu, 3 Jun 2010 12:48:46 +0200 Received: from ensibm.imag.fr (localhost [127.0.0.1]) by ensibm.imag.fr (8.13.8/8.13.8/ImagV2.1.sb_ens.pm) with ESMTP id o53Amk2A008501; Thu, 3 Jun 2010 12:48:46 +0200 Received: (from bonneta@localhost) by ensibm.imag.fr (8.13.8/8.13.8/Submit) id o53AmkxN008500; Thu, 3 Jun 2010 12:48:46 +0200 X-Mailer: git-send-email 1.6.6.7.ga5fe3 In-Reply-To: <1275562038-7468-4-git-send-email-axel.bonnet@ensimag.imag.fr> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.0.1 (shiva.imag.fr [129.88.30.5]); Thu, 03 Jun 2010 12:41:22 +0200 (CEST) X-IMAG-MailScanner-Information: Please contact MI2S MIM for more information X-MailScanner-ID: o53AfMax028121 X-IMAG-MailScanner: Found to be clean X-IMAG-MailScanner-SpamCheck: X-IMAG-MailScanner-From: axel.bonnet@ensimag.imag.fr Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Test the correct functionning of textconv with blame and blame HEAD^ . Test the case when no driver is specified. Signed-off-by: Diane Gasselin Signed-off-by: Cl=C3=A9ment Poulain Signed-off-by: Axel Bonnet --- t/t8006-blame-textconv.sh | 98 +++++++++++++++++++++++++++++++++++++= ++++++++ 1 files changed, 98 insertions(+), 0 deletions(-) create mode 100755 t/t8006-blame-textconv.sh diff --git a/t/t8006-blame-textconv.sh b/t/t8006-blame-textconv.sh new file mode 100755 index 0000000..d3780ed --- /dev/null +++ b/t/t8006-blame-textconv.sh @@ -0,0 +1,98 @@ +#!/bin/sh + +test_description=3D'git blame textconv support' +. ./test-lib.sh + +find_blame() { + sed -e 's/^.*(/(/g' +} + +cat >helper <<'EOF' +#!/bin/sh +sed 's/^/converted: /' "$@" >helper.out +cat helper.out +EOF +chmod +x helper + +test_expect_success 'setup ' ' + echo test 1 >one.bin && + echo test number 2 >two.bin && + ln one.bin link.bin && + git add . && + GIT_AUTHOR_NAME=3DNumber1 git commit -a -m First --date=3D"2010-01-01= 18:00:00" && + echo test 1 version 2 >one.bin && + echo test number 2 version 2 >>two.bin && + GIT_AUTHOR_NAME=3DNumber2 git commit -a -m Second --date=3D"2010-01-0= 1 20:00:00" +' + +cat >expected <blame + find_blame result + test_cmp expected result +' + +test_expect_success 'setup textconv filters' ' + echo "*.bin diff=3Dtest" >.gitattributes && + git config diff.test.textconv ./helper && + git config diff.test.cachetextconv false +' + +test_expect_success 'blame with --no-textconv' ' + git blame --no-textconv one.bin | grep Number2 >blame + find_blame result + test_cmp expected result +' + +cat >expected <blame + find_blame result + test_cmp expected result +' + +cat >expected <blame + find_blame result + test_cmp expected result +' + +test_expect_success 'make a new commit' ' + echo "test number 2 version 3" >>two.bin && + GIT_AUTHOR_NAME=3DNumber3 git commit -a -m Third --date=3D"2010-01-01= 22:00:00" +' + +test_expect_success 'textconv with blame from previous revision' ' + git blame HEAD^ two.bin >blame + find_blame result + test_cmp expected result +' + +cat >expected <>link.bin && + GIT_AUTHOR_NAME=3DNumber3 git commit -a -m Third --date=3D"2010-01-01= 20:00:00" +' + +test_expect_success 'blame textconv on links' ' + git blame link.bin >blame + find_blame result + test_cmp expected result +' + +test_done --=20 1.6.6.7.ga5fe3