pull --rebase: exit early when the working directory is dirty

diff --git a/diff.h b/diff.h
index 9a652e7f38e3c1aeb7c7eaf840dea7bcea285311..3a02d38d12d94c39ff9ef3ab744ea7d157fb52b4 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -83,12 +83,12 @@ struct diff_options {
        int pickaxe_opts;
        int rename_score;
        int rename_limit;
+       int warn_on_too_large_rename;
        int dirstat_percent;
        int setup;
        int abbrev;
        const char *prefix;
        int prefix_length;
-       const char *msg_sep;
        const char *stat_sep;
        long xdl_opts;
 
@@ -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;