Merge branch 'jk/interpret-branch-name-fix' into maint

diff --git a/fetch-pack.h b/fetch-pack.h
index dc5266c970655a9fe4f971a0132c14e1cf731acc..20ccc12e57b9499b0716c8295b4adea38d8d2a86 100644 (file)
--- a/fetch-pack.h
+++ b/fetch-pack.h
@@ -2,6 +2,7 @@
 #define FETCH_PACK_H
 
 #include "string-list.h"
+#include "run-command.h"
 
 struct fetch_pack_args {
        const char *uploadpack;
@@ -13,10 +14,13 @@ struct fetch_pack_args {
                use_thin_pack:1,
                fetch_all:1,
                stdin_refs:1,
+               diag_url:1,
                verbose:1,
                no_progress:1,
                include_tag:1,
-               stateless_rpc:1;
+               stateless_rpc:1,
+               check_self_contained_and_connected:1,
+               self_contained_and_connected:1;
 };
 
 /*