Merge branch 'maint-1.5.4' into maint

diff --git a/fetch-pack.h b/fetch-pack.h
index a7888ea302cde44b072cc019394ae43dbb4cf95d..8bd9c32561e79d194d27fa10cc98a26aa2cb673c 100644 (file)
--- a/fetch-pack.h
+++ b/fetch-pack.h
@@ -12,10 +12,13 @@ struct fetch_pack_args
                use_thin_pack:1,
                fetch_all:1,
                verbose:1,
-               no_progress:1;
+               no_progress:1,
+               include_tag:1;
 };
 
 struct ref *fetch_pack(struct fetch_pack_args *args,
+               int fd[], struct child_process *conn,
+               const struct ref *ref,
                const char *dest,
                int nr_heads,
                char **heads,