Always set *nongit_ok in setup_git_directory_gently()

diff --git a/diff.h b/diff.h
index 9a652e7f38e3c1aeb7c7eaf840dea7bcea285311..f2c77391a965bcc731de6478a6553cdc652319ec 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -98,6 +98,9 @@ struct diff_options {
        /* this is set by diffcore for DIFF_FORMAT_PATCH */
        int found_changes;
 
+       FILE *file;
+       int close_file;
+
        int nr_paths;
        const char **paths;
        int *pathlens;