Merge branch 'jk/maint-upload-pack-shallow' into maint

diff --git a/diff.h b/diff.h
index 0083d92438916a8188656df140ba70d6acc8c6f6..007a0554d4b252e83e98f5578758d51ec0c6e120 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -110,7 +110,8 @@ struct diff_options {
        int pickaxe_opts;
        int rename_score;
        int rename_limit;
-       int warn_on_too_large_rename;
+       int needed_rename_limit;
+       int show_rename_progress;
        int dirstat_percent;
        int setup;
        int abbrev;
@@ -133,9 +134,7 @@ struct diff_options {
        FILE *file;
        int close_file;
 
-       int nr_paths;
-       const char **paths;
-       int *pathlens;
+       struct pathspec pathspec;
        change_fn_t change;
        add_remove_fn_t add_remove;
        diff_format_fn_t format_callback;