Merge branch 'jc/maint-follow-rename-fix'

[thirdparty/git.git] / diff.h

diff --git a/diff.h b/diff.h
index 53ad345469ad106e768c0d9eda7f732e09832b01..d43da9da95fae4dd13d3abbe738948708cf90939 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -127,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;