diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-03-18 13:59:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-18 13:59:56 -0700 |
| commit | 34120a5fb555a24904a85e64554bdcc7bcc17963 (patch) | |
| tree | 9a20fc3e1c20238f18173c0bf53f927bf1de3615 /diffcore.h | |
| parent | Merge branch 'nd/http-fetch-shallow-fix' into maint (diff) | |
| parent | diff: do not quit early on stat-dirty files (diff) | |
| download | tgif-34120a5fb555a24904a85e64554bdcc7bcc17963.tar.xz | |
Merge branch 'nd/diff-quiet-stat-dirty' into maint
"git diff --quiet -- pathspec1 pathspec2" sometimes did not return
correct status value.
* nd/diff-quiet-stat-dirty:
diff: do not quit early on stat-dirty files
diff.c: move diffcore_skip_stat_unmatch core logic out for reuse later
Diffstat (limited to 'diffcore.h')
| -rw-r--r-- | diffcore.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/diffcore.h b/diffcore.h index 79de8cf28d..1315cfd4ef 100644 --- a/diffcore.h +++ b/diffcore.h @@ -68,6 +68,8 @@ struct diff_filepair { unsigned broken_pair : 1; unsigned renamed_pair : 1; unsigned is_unmerged : 1; + unsigned done_skip_stat_unmatch : 1; + unsigned skip_stat_unmatch_result : 1; }; #define DIFF_PAIR_UNMERGED(p) ((p)->is_unmerged) |