X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=diff.c;h=2253ec880298b4f146cb20f6dbae365d77b8fdfe;hb=1b5b8cf072491e0a43e668c685b782efce9a6f0f;hp=643f4f3f6d02583ba74b81a5454ec89a79784161;hpb=3517022568b0cbf2ada289e43c8c562b61132082;p=thirdparty%2Fgit.git

diff --git a/diff.c b/diff.c
index 643f4f3f6d..2253ec8802 100644
--- a/diff.c
+++ b/diff.c
@@ -4634,7 +4634,8 @@ void diff_setup_done(struct diff_options *options)
 	 * inside contents.
 	 */
 
-	if ((options->xdl_opts & XDF_WHITESPACE_FLAGS))
+	if ((options->xdl_opts & XDF_WHITESPACE_FLAGS) ||
+	    options->ignore_regex_nr)
 		options->flags.diff_from_contents = 1;
 	else
 		options->flags.diff_from_contents = 0;