admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'nd/diff-quiet-stat-dirty'

Browse Source 
"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
This commit is contained in:
Junio C Hamano
2014-02-27 14:01:21 -08:00
parent cbaeafc325 f34b205f6c
commit 1e745453fe
3 changed files with 51 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
diffcore.h
View File

@@ -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)