tree-diff: rework diff_tree() to generate diffs for multiparent cases as well

diff --git a/fetch-pack.h b/fetch-pack.h
index 9b08388edfd112318ba727d1959cbc3391c1d6b1..bb7fd76e5939d812f1f89b787324ae6ec519ca15 100644 (file)
--- a/fetch-pack.h
+++ b/fetch-pack.h
@@ -4,6 +4,8 @@
 #include "string-list.h"
 #include "run-command.h"
 
+struct sha1_array;
+
 struct fetch_pack_args {
        const char *uploadpack;
        int unpacklimit;
@@ -14,12 +16,15 @@ struct fetch_pack_args {
        unsigned use_thin_pack:1;
        unsigned fetch_all:1;
        unsigned stdin_refs:1;
+       unsigned diag_url:1;
        unsigned verbose:1;
        unsigned no_progress:1;
        unsigned include_tag:1;
        unsigned stateless_rpc:1;
        unsigned check_self_contained_and_connected:1;
        unsigned self_contained_and_connected:1;
+       unsigned cloning:1;
+       unsigned update_shallow:1;
 };
 
 /*
@@ -33,6 +38,7 @@ struct ref *fetch_pack(struct fetch_pack_args *args,
                       const char *dest,
                       struct ref **sought,
                       int nr_sought,
+                      struct sha1_array *shallow,
                       char **pack_lockfile);
 
 #endif