summaryrefslogtreecommitdiff
path: root/diffcore.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-02-27 14:01:21 -0800
committerJunio C Hamano <gitster@pobox.com>2014-02-27 14:01:21 -0800
commit1e745453fee88b3322b8be05548220c31cf654cd (patch)
tree63d872c82f9cd17084f4dd59d784d50f7fda32a8 /diffcore.h
parentcbaeafc3251d08b479c5eb735444bb6ad6210c93 (diff)
parentf34b205f6cc2c78cbed03a1582422cb59e36f729 (diff)
downloadgit-1e745453fee88b3322b8be05548220c31cf654cd.tar.gz
Merge branch 'nd/diff-quiet-stat-dirty'
"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.h2
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)