From: René Scharfe <l.s.r@web.de>
Date: Sat, 18 Jun 2022 11:12:28 +0000 (+0200)
Subject: combine-diff: abort if --ignore-matching-lines is given
X-Git-Tag: v2.37.2~31^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e3d1be4237b831b517a54c70ae3c4ec3840345a4;p=thirdparty%2Fgit.git

combine-diff: abort if --ignore-matching-lines is given

The code for combined diffs doesn't currently support ignoring changes
that match a regex.  Abort and report that fact instead of running into
a segfault.

Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/combine-diff.c b/combine-diff.c
index d93782daeb..512897e3bf 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -1498,6 +1498,10 @@ void diff_tree_combined(const struct object_id *oid,
 	int i, num_paths, needsep, show_log_first, num_parent = parents->nr;
 	int need_generic_pathscan;
 
+	if (opt->ignore_regex_nr)
+		die("combined diff and '%s' cannot be used together",
+		    "--ignore-matching-lines");
+
 	/* nothing to do, if no parents */
 	if (!num_parent)
 		return;