X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diff.h;h=bf2f44d840735684c89f654ee6f3b3a935af2c55;hb=5418d96ddca8134b5abeb99430f61c062d91f722;hp=2b94ad66d2fa9cd7105f505fd466ecab63401505;hpb=dea007fb4c8170ea007b577698c7b44df6c318b9;p=git.git

diff --git a/diff.h b/diff.h
index 2b94ad66d..bf2f44d84 100644
--- a/diff.h
+++ b/diff.h
@@ -77,6 +77,7 @@ typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data)
 #define DIFF_OPT_DIRTY_SUBMODULES    (1 << 24)
 #define DIFF_OPT_IGNORE_UNTRACKED_IN_SUBMODULES (1 << 25)
 #define DIFF_OPT_IGNORE_DIRTY_SUBMODULES (1 << 26)
+#define DIFF_OPT_OVERRIDE_SUBMODULE_CONFIG (1 << 27)
 
 #define DIFF_OPT_TST(opts, flag)    ((opts)->flags & DIFF_OPT_##flag)
 #define DIFF_OPT_SET(opts, flag)    ((opts)->flags |= DIFF_OPT_##flag)
@@ -126,6 +127,9 @@ struct diff_options {
 	/* this is set by diffcore for DIFF_FORMAT_PATCH */
 	int found_changes;
 
+	/* to support internal diff recursion by --follow hack*/
+	int found_follow;
+
 	FILE *file;
 	int close_file;