Merge remote-tracking branch 'ko/maint' into jc/diff-index-quick-exit-early

diff --git a/diff.h b/diff.h
index 42b49d8f228fd2cc680ab9a2e332819d46f2f875..394765dd381fb3056252c4cba3a44c911ea5f108 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -195,6 +195,8 @@ extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_
 
 void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b);
 
+extern int diff_can_quit_early(struct diff_options *);
+
 extern void diff_addremove(struct diff_options *,
                           int addremove,
                           unsigned mode,