diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-12-18 23:15:18 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-12-18 23:15:18 (GMT) |
commit | 59fcf746f5a6253b3c0a84a94ecd5cf1add56e3a (patch) | |
tree | f2eca2aa27d7014846d4d0381ad1306c48c5b964 /diff.c | |
parent | d4187bd4d5091cf2700b0a954cbdc379e5d1248d (diff) | |
parent | 50f04394908fe308a421b360951b1f73b00363ee (diff) | |
download | git-59fcf746f5a6253b3c0a84a94ecd5cf1add56e3a.zip git-59fcf746f5a6253b3c0a84a94ecd5cf1add56e3a.tar.gz git-59fcf746f5a6253b3c0a84a94ecd5cf1add56e3a.tar.bz2 |
Merge branch 'jc/diff-I-status-fix'
"git diff -I<pattern> -exit-code" should exit with 0 status when
all the changes match the ignored pattern, but it didn't.
* jc/diff-I-status-fix:
diff: correct interaction between --exit-code and -I<pattern>
Diffstat (limited to 'diff.c')
-rw-r--r-- | diff.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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; |