Merge branch 'nd/diff-quiet-stat-dirty' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 18 Mar 2014 20:59:55 +0000 (13:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 18 Mar 2014 20:59:56 +0000 (13:59 -0700)
"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

1  2 
diff.c
diffcore.h
diff --cc diff.c
Simple merge
diff --cc diffcore.h
Simple merge