From mboxrd@z Thu Jan 1 00:00:00 1970 From: Samuel Bronson Subject: [PATCH v3 1/3] diff: Tests for "git diff -O" Date: Sat, 14 Dec 2013 17:18:39 -0500 Message-ID: <1387059521-23616-2-git-send-email-naesten@gmail.com> References: <1387059521-23616-1-git-send-email-naesten@gmail.com> Cc: Jonathan Nieder , Anders Waldenborg , Samuel Bronson To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sat Dec 14 23:19:38 2013 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1VrxYf-0002YB-2v for gcvg-git-2@plane.gmane.org; Sat, 14 Dec 2013 23:19:37 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754285Ab3LNWTb (ORCPT ); Sat, 14 Dec 2013 17:19:31 -0500 Received: from mail-qe0-f50.google.com ([209.85.128.50]:65336 "EHLO mail-qe0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754265Ab3LNWTb (ORCPT ); Sat, 14 Dec 2013 17:19:31 -0500 Received: by mail-qe0-f50.google.com with SMTP id 1so2797430qec.37 for ; Sat, 14 Dec 2013 14:19:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=TX5RdXmFPRYQ97YQSwdt1aWrtty8XPNPbZydHEQ5Jd8=; b=Wn2aFfCkArFfcns3qSPNFo/EWQXikOWQdMVPtZkFcIb8MCstxeA8VfgQnDTJwh4lAL Ya0VgGuP4JPGvtTj2zbpxTGTthOgT6LxHMyRT/XojnV7LcaOF6uGk2Ufnr1KBBTB02yG qjVWAEc5srdGZL+hG0jx5x/BEnonDOhUFuOqgG4l1rPF5921oA3yCuKRU/45M/yJLRiB 0KHlb59HV8ZKuru/XXHVEBs/BunIsf+2670n6Y/KFfeVNvJTFwiHOta6HiQjkRF8Zj1D NoOCyiskEh+NPvvvoVIbc+SNTkkV2dIcWf9UqEhpKPc36kSm6DEbxlC5ty/UL4ZS/8O5 JW5Q== X-Received: by 10.49.12.43 with SMTP id v11mr18620793qeb.50.1387059570528; Sat, 14 Dec 2013 14:19:30 -0800 (PST) Received: from hydrogen (naesten-pt.tunnel.tserv4.nyc4.ipv6.he.net. [2001:470:1f06:57::2]) by mx.google.com with ESMTPSA id c1sm24682509qad.1.2013.12.14.14.19.29 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 14 Dec 2013 14:19:29 -0800 (PST) Received: from naesten by hydrogen with local (Exim 4.80) (envelope-from ) id 1VrxYW-00069l-H6; Sat, 14 Dec 2013 17:19:28 -0500 X-Mailer: git-send-email 1.8.4.3 In-Reply-To: <1387059521-23616-1-git-send-email-naesten@gmail.com> In-Reply-To: References: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Heavily adapted from Anders' patch: "diff: Add diff.orderfile configuration variable" Signed-off-by: Anders Waldenborg Signed-off-by: Samuel Bronson --- t/t4056-diff-order.sh | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100755 t/t4056-diff-order.sh diff --git a/t/t4056-diff-order.sh b/t/t4056-diff-order.sh new file mode 100755 index 0000000..398b3f6 --- /dev/null +++ b/t/t4056-diff-order.sh @@ -0,0 +1,72 @@ +#!/bin/sh + +test_description='diff order' + +. ./test-lib.sh + +create_files () { + echo "$1" >a.h && + echo "$1" >b.c && + echo "$1" >c/Makefile && + echo "$1" >d.txt && + git add a.h b.c c/Makefile d.txt && + git commit -m"$1" +} + +test_expect_success 'setup' ' + mkdir c && + create_files 1 && + create_files 2 && + + cat >order_file_1 <<-\EOF && + *Makefile + *.txt + *.h + * + EOF + + cat >order_file_2 <<-\EOF && + *Makefile + *.h + *.c + * + EOF + + cat >expect_none <<-\EOF && + a.h + b.c + c/Makefile + d.txt + EOF + + cat >expect_1 <<-\EOF && + c/Makefile + d.txt + a.h + b.c + EOF + + cat >expect_2 <<-\EOF && + c/Makefile + a.h + b.c + d.txt + EOF + + true # end chain of && +' + +test_expect_success "no order (=tree object order)" ' + git diff --name-only HEAD^..HEAD >actual && + test_cmp expect_none actual +' + +for i in 1 2 +do + test_expect_success "orderfile using option ($i)" ' + git diff -Oorder_file_$i --name-only HEAD^..HEAD >actual && + test_cmp expect_$i actual +' +done + +test_done -- 1.8.4.3