From: "Michał Kępień" <michal@isc.org>
To: git@vger.kernel.org
Subject: [PATCH 2/2] t: add -I<regex> tests
Date: Thu, 1 Oct 2020 14:06:06 +0200 [thread overview]
Message-ID: <20201001120606.25773-3-michal@isc.org> (raw)
In-Reply-To: <20201001120606.25773-1-michal@isc.org>
Exercise the new 'git diff -I<regex>' option in various scenarios to
ensure it behaves as expected.
Signed-off-by: Michał Kępień <michal@isc.org>
---
t/t4069-diff-ignore-regex.sh | 330 +++++++++++++++++++++++++++++++++++
1 file changed, 330 insertions(+)
create mode 100755 t/t4069-diff-ignore-regex.sh
diff --git a/t/t4069-diff-ignore-regex.sh b/t/t4069-diff-ignore-regex.sh
new file mode 100755
index 0000000000..323687f1dc
--- /dev/null
+++ b/t/t4069-diff-ignore-regex.sh
@@ -0,0 +1,330 @@
+#!/bin/sh
+
+test_description='Test diff -I<regex>'
+
+. ./test-lib.sh
+. "$TEST_DIRECTORY"/diff-lib.sh
+
+test_expect_success setup '
+ test_seq 20 >x &&
+ git update-index --add x
+'
+
+test_expect_success 'one line changed' '
+ test_seq 20 | sed "s/10/100/" >x &&
+
+ # Get plain diff
+ git diff >plain &&
+ cat >expected <<-EOF &&
+ diff --git a/x b/x
+ --- a/x
+ +++ b/x
+ @@ -7,7 +7,7 @@
+ 7
+ 8
+ 9
+ -10
+ +100
+ 11
+ 12
+ 13
+ EOF
+ compare_diff_patch expected plain &&
+
+ # Both old and new line match regex - ignore change
+ git diff -I "^10" >actual &&
+ test_must_be_empty actual &&
+
+ # Only old line matches regex - do not ignore change
+ git diff -I "^10\$" >actual &&
+ compare_diff_patch plain actual &&
+
+ # Only new line matches regex - do not ignore change
+ git diff -I "^100" >actual &&
+ compare_diff_patch plain actual
+'
+
+test_expect_success 'one line removed' '
+ test_seq 20 | sed "10d" >x &&
+
+ # Get plain diff
+ git diff >plain &&
+ cat >expected <<-EOF &&
+ diff --git a/x b/x
+ --- a/x
+ +++ b/x
+ @@ -7,7 +7,6 @@
+ 7
+ 8
+ 9
+ -10
+ 11
+ 12
+ 13
+ EOF
+ compare_diff_patch expected plain &&
+
+ # Removed line matches regex - ignore change
+ git diff -I "^10" >actual &&
+ test_must_be_empty actual &&
+
+ # Removed line does not match regex - do not ignore change
+ git diff -I "^101" >actual &&
+ compare_diff_patch plain actual
+'
+
+test_expect_success 'one line added' '
+ test_seq 21 >x &&
+
+ # Get plain diff
+ git diff >plain &&
+ cat >expected <<-EOF &&
+ diff --git a/x b/x
+ --- a/x
+ +++ b/x
+ @@ -18,3 +18,4 @@
+ 18
+ 19
+ 20
+ +21
+ EOF
+ compare_diff_patch expected plain &&
+
+ # Added line matches regex - ignore change
+ git diff -I "^21" >actual &&
+ test_must_be_empty actual &&
+
+ # Added line does not match regex - do not ignore change
+ git diff -I "^212" >actual &&
+ compare_diff_patch plain actual
+'
+
+test_expect_success 'last two lines changed' '
+ test_seq 20 | sed "s/19/21/; s/20/22/" >x &&
+
+ # Get plain diff
+ git diff >plain &&
+ cat >expected <<-EOF &&
+ diff --git a/x b/x
+ --- a/x
+ +++ b/x
+ @@ -16,5 +16,5 @@
+ 16
+ 17
+ 18
+ -19
+ -20
+ +21
+ +22
+ EOF
+ compare_diff_patch expected plain &&
+
+ # All changed lines match regex - ignore change
+ git diff -I "^[12]" >actual &&
+ test_must_be_empty actual &&
+
+ # Not all changed lines match regex - do not ignore change
+ git diff -I "^2" >actual &&
+ compare_diff_patch plain actual
+'
+
+test_expect_success 'two non-adjacent lines removed in the same hunk' '
+ test_seq 20 | sed "1d; 3d" >x &&
+
+ # Get plain diff
+ git diff >plain &&
+ cat >expected <<-EOF &&
+ diff --git a/x b/x
+ --- a/x
+ +++ b/x
+ @@ -1,6 +1,4 @@
+ -1
+ 2
+ -3
+ 4
+ 5
+ 6
+ EOF
+ compare_diff_patch expected plain &&
+
+ # Both removed lines match regex - ignore hunk
+ git diff -I "^[1-3]" >actual &&
+ test_must_be_empty actual &&
+
+ # First removed line does not match regex - do not ignore hunk
+ git diff -I "^[2-3]" >actual &&
+ compare_diff_patch plain actual &&
+
+ # Second removed line does not match regex - do not ignore hunk
+ git diff -I "^[1-2]" >actual &&
+ compare_diff_patch plain actual
+'
+
+test_expect_success 'two non-adjacent lines removed in the same hunk, with -U1' '
+ test_seq 20 | sed "1d; 3d" >x &&
+
+ # Get plain diff
+ git diff -U1 >plain &&
+ cat >expected <<-EOF &&
+ diff --git a/x b/x
+ --- a/x
+ +++ b/x
+ @@ -1,4 +1,2 @@
+ -1
+ 2
+ -3
+ 4
+ EOF
+ compare_diff_patch expected plain &&
+
+ # Both removed lines match regex - ignore hunk
+ git diff -U1 -I "^[1-3]" >actual &&
+ test_must_be_empty actual &&
+
+ # First removed line does not match regex, but is out of context - ignore second change
+ git diff -U1 -I "^[2-3]" >actual &&
+ cat >second-change-ignored <<-EOF &&
+ diff --git a/x b/x
+ --- a/x
+ +++ b/x
+ @@ -1,2 +1 @@
+ -1
+ 2
+ EOF
+ compare_diff_patch second-change-ignored actual &&
+
+ # Second removed line does not match regex, but is out of context - ignore first change
+ git diff -U1 -I "^[1-2]" >actual &&
+ cat >first-change-ignored <<-EOF &&
+ diff --git a/x b/x
+ --- a/x
+ +++ b/x
+ @@ -2,3 +1,2 @@
+ 2
+ -3
+ 4
+ EOF
+ compare_diff_patch first-change-ignored actual
+'
+
+test_expect_success 'multiple hunks' '
+ test_seq 20 | sed "1d; 20d" >x &&
+
+ # Get plain diff
+ git diff >plain &&
+ cat >expected <<-EOF &&
+ diff --git a/x b/x
+ --- a/x
+ +++ b/x
+ @@ -1,4 +1,3 @@
+ -1
+ 2
+ 3
+ 4
+ @@ -17,4 +16,3 @@
+ 17
+ 18
+ 19
+ -20
+ EOF
+ compare_diff_patch expected plain &&
+
+ # Ignore both hunks
+ git diff -I "^[12]" >actual &&
+ test_must_be_empty actual &&
+
+ # Only ignore first hunk
+ git diff -I "^1" >actual &&
+ cat >first-hunk-ignored <<-EOF &&
+ diff --git a/x b/x
+ --- a/x
+ +++ b/x
+ @@ -17,4 +16,3 @@
+ 17
+ 18
+ 19
+ -20
+ EOF
+ compare_diff_patch first-hunk-ignored actual &&
+
+ # Only ignore second hunk
+ git diff -I "^2" >actual &&
+ cat >second-hunk-ignored <<-EOF &&
+ diff --git a/x b/x
+ --- a/x
+ +++ b/x
+ @@ -1,4 +1,3 @@
+ -1
+ 2
+ 3
+ 4
+ EOF
+ compare_diff_patch second-hunk-ignored actual
+'
+
+test_expect_success 'multiple hunks, with --ignore-blank-lines' '
+ echo >x &&
+ test_seq 21 >>x &&
+
+ # Get plain diff
+ git diff >plain &&
+ cat >expected <<-EOF &&
+ diff --git a/x b/x
+ --- a/x
+ +++ b/x
+ @@ -1,3 +1,4 @@
+ +
+ 1
+ 2
+ 3
+ @@ -18,3 +19,4 @@
+ 18
+ 19
+ 20
+ +21
+ EOF
+ compare_diff_patch expected plain &&
+
+ # -I does not override --ignore-blank-lines - ignore both hunks
+ git diff --ignore-blank-lines -I ^21 >actual &&
+ test_must_be_empty actual
+'
+
+test_expect_success 'diffstat' '
+ test_seq 20 | sed "s/^5/0/p; s/^15/10/; 16d" >x &&
+
+ # Get plain diffstat
+ git diff --stat >actual &&
+ cat >expected <<-EOF &&
+ x | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+ EOF
+ test_cmp expected actual &&
+
+ # Ignore both hunks
+ git diff --stat -I "^[0-5]" >actual &&
+ test_must_be_empty actual &&
+
+ # Only ignore first hunk
+ git diff --stat -I "^[05]" >actual &&
+ cat >expected <<-EOF &&
+ x | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+ EOF
+ test_cmp expected actual &&
+
+ # Only ignore second hunk
+ git diff --stat -I "^1" >actual &&
+ cat >expected <<-EOF &&
+ x | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+ EOF
+ test_cmp expected actual
+'
+
+test_expect_success 'invalid regex' '
+ >x &&
+ git diff -I "^[1" 2>&1 | grep "invalid regex: "
+'
+
+test_done
--
2.28.0
next prev parent reply other threads:[~2020-10-01 12:45 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-01 12:06 [PATCH 0/2] diff: add -I<regex> that ignores matching changes Michał Kępień
2020-10-01 12:06 ` [PATCH 1/2] " Michał Kępień
2020-10-01 18:21 ` Junio C Hamano
2020-10-07 19:48 ` Michał Kępień
2020-10-07 20:08 ` Junio C Hamano
2020-10-01 12:06 ` Michał Kępień [this message]
2020-10-01 17:02 ` [PATCH 0/2] " Junio C Hamano
2020-10-12 9:17 ` [PATCH v2 0/3] " Michał Kępień
2020-10-12 9:17 ` [PATCH v2 1/3] merge-base, xdiff: zero out xpparam_t structures Michał Kępień
2020-10-12 11:14 ` Johannes Schindelin
2020-10-12 17:09 ` Junio C Hamano
2020-10-12 19:52 ` Junio C Hamano
2020-10-13 6:35 ` Michał Kępień
2020-10-12 9:17 ` [PATCH v2 2/3] diff: add -I<regex> that ignores matching changes Michał Kępień
2020-10-12 11:20 ` Johannes Schindelin
2020-10-12 20:00 ` Junio C Hamano
2020-10-12 20:39 ` Johannes Schindelin
2020-10-12 21:43 ` Junio C Hamano
2020-10-13 6:37 ` Michał Kępień
2020-10-13 15:49 ` Junio C Hamano
2020-10-13 6:36 ` Michał Kępień
2020-10-13 12:02 ` Johannes Schindelin
2020-10-13 15:53 ` Junio C Hamano
2020-10-13 18:45 ` Michał Kępień
2020-10-12 18:01 ` Junio C Hamano
2020-10-13 6:38 ` Michał Kępień
2020-10-12 20:04 ` Junio C Hamano
2020-10-13 6:38 ` Michał Kępień
2020-10-12 9:17 ` [PATCH v2 3/3] t: add -I<regex> tests Michał Kępień
2020-10-12 11:49 ` Johannes Schindelin
2020-10-13 6:38 ` Michał Kępień
2020-10-13 12:00 ` Johannes Schindelin
2020-10-13 16:00 ` Junio C Hamano
2020-10-13 19:01 ` Michał Kępień
2020-10-15 11:45 ` Johannes Schindelin
2020-10-15 7:24 ` [PATCH v3 0/2] diff: add -I<regex> that ignores matching changes Michał Kępień
2020-10-15 7:24 ` [PATCH v3 1/2] merge-base, xdiff: zero out xpparam_t structures Michał Kępień
2020-10-15 7:24 ` [PATCH v3 2/2] diff: add -I<regex> that ignores matching changes Michał Kępień
2020-10-16 15:32 ` Phillip Wood
2020-10-16 18:04 ` Junio C Hamano
2020-10-19 9:48 ` Michał Kępień
2020-10-16 18:16 ` Junio C Hamano
2020-10-19 9:55 ` Michał Kępień
2020-10-19 17:29 ` Junio C Hamano
2020-10-16 10:00 ` [PATCH v3 0/2] " Johannes Schindelin
2020-10-20 6:48 ` [PATCH v4 " Michał Kępień
2020-10-20 6:48 ` [PATCH v4 1/2] merge-base, xdiff: zero out xpparam_t structures Michał Kępień
2020-10-20 6:48 ` [PATCH v4 2/2] diff: add -I<regex> that ignores matching changes Michał Kępień
2021-02-05 14:13 ` [PATCH 1/2] diff: add an API for deferred freeing Ævar Arnfjörð Bjarmason
2021-02-10 16:00 ` Johannes Schindelin
2021-02-11 3:00 ` Ævar Arnfjörð Bjarmason
2021-02-11 9:40 ` Johannes Schindelin
2021-02-11 10:21 ` Jeff King
2021-02-11 10:45 ` [PATCH v2 0/2] " Ævar Arnfjörð Bjarmason
2021-02-11 10:45 ` [PATCH v2 1/2] " Ævar Arnfjörð Bjarmason
2021-02-11 10:45 ` [PATCH v2 2/2] diff: plug memory leak from regcomp() on {log,diff} -I Ævar Arnfjörð Bjarmason
2021-02-05 14:13 ` [PATCH " Ævar Arnfjörð Bjarmason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201001120606.25773-3-michal@isc.org \
--to=michal@isc.org \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).