Update libgit2 to 1.7.0

8 files changed, 231 insertions, 414 deletions

diff --git a/etc/import/TARGETS.git2 b/etc/import/TARGETS.git2
index 0d15117f..486eb0e0 100644
--- a/etc/import/TARGETS.git2
+++ b/etc/import/TARGETS.git2
@@ -18,7 +18,7 @@
     , "ENV"
     , "USE_SYSTEM_LIBS"
     , "DEBUG_POOL"
-    , "THREADSAFE"
+    , "USE_THREADS"
     , "REGEX_BACKEND"
     , "WINHTTP"
     , "USE_ICONV"
@@ -88,7 +88,7 @@
     , "TARGET_ARCH"
     , "USE_SYSTEM_LIBS"
     , "DEBUG_POOL"
-    , "THREADSAFE"
+    , "USE_THREADS"
     , "REGEX_BACKEND"
     , "WINHTTP"
     , "USE_ICONV"
@@ -124,7 +124,9 @@
             {"type": "fail", "msg": "Required variable 'OS' is not set."}
           }
         ]
-      , ["THREADSAFE", {"type": "var", "name": "THREADSAFE", "default": true}]
+      , [ "USE_THREADS"
+        , {"type": "var", "name": "USE_THREADS", "default": true}
+        ]
       , ["USE_SSH", {"type": "var", "name": "USE_SSH", "default": true}]
       , ["USE_GSSAPI", {"type": "var", "name": "USE_GSSAPI", "default": true}]
       , ["USE_SHA1", {"type": "var", "name": "USE_SHA1", "default": true}]
@@ -226,7 +228,7 @@
       , "vars":
         [ "USE_SYSTEM_LIBS"
         , "DEBUG_POOL"
-        , "THREADSAFE"
+        , "USE_THREADS"
         , "REGEX_BACKEND"
         , "USE_ICONV"
         , "USE_NSEC"
diff --git a/etc/import/deps/xdiff/TARGETS.git2 b/etc/import/deps/xdiff/TARGETS.git2
new file mode 100644
index 00000000..c204aec6
--- /dev/null
+++ b/etc/import/deps/xdiff/TARGETS.git2
@@ -0,0 +1,5 @@
+{ "srcs":
+  {"type": ["@", "rules", "data", "staged"], "srcs": [["GLOB", null, "*.c"]]}
+, "hdrs":
+  {"type": ["@", "rules", "data", "staged"], "srcs": [["GLOB", null, "*.h"]]}
+}
diff --git a/etc/import/include/git2/TARGETS.git2 b/etc/import/include/git2/TARGETS.git2
index f0ab360d..5f16be19 100644
--- a/etc/import/include/git2/TARGETS.git2
+++ b/etc/import/include/git2/TARGETS.git2
@@ -1,158 +1,4 @@
-{ "sys/features.h":
-  { "type": "configure"
-  , "arguments_config":
-    [ "OS"
-    , "ARCH"
-    , "TARGET_ARCH"
-    , "DEBUG_POOL"
-    , "THREADSAFE"
-    , "REGEX_BACKEND"
-    , "USE_ICONV"
-    , "USE_NSEC"
-    , "USE_SSH"
-    , "USE_NTLMCLIENT"
-    , "USE_GSSAPI"
-    , "USE_SHA1"
-    , "USE_SHA256"
-    , "USE_HTTPS"
-    ]
-  , "target": "feature_header"
-  , "config":
-    { "type": "let*"
-    , "bindings":
-      [ [ "TARGET_ARCH"
-        , { "type": "var"
-          , "name": "TARGET_ARCH"
-          , "default": {"type": "var", "name": "ARCH"}
-          }
-        ]
-      , [ "IS_BSD"
-        , { "type": "case"
-          , "expr": {"type": "var", "name": "OS"}
-          , "case": {"darwin": true, "bsd": true}
-          }
-        ]
-      , [ "IS_32BIT"
-        , { "type": "case"
-          , "expr":
-            { "type": "var"
-            , "name": "TARGET_ARCH"
-            , "default": {"type": "var", "name": "ARCH"}
-            }
-          , "case": {"x86": true, "arm": true}
-          }
-        ]
-      , [ "defines1"
-        , { "type": "++"
-          , "$1":
-            [ [ ["GIT_DEBUG_POOL", {"type": "var", "name": "DEBUG_POOL"}]
-              , ["GIT_THREADS", {"type": "var", "name": "THREADSAFE"}]
-              , { "type": "if"
-                , "cond": {"type": "var", "name": "IS_32BIT"}
-                , "then": ["GIT_ARCH_32", 1]
-                , "else": ["GIT_ARCH_64", 1]
-                }
-              , ["GIT_USE_ICONV", {"type": "var", "name": "USE_ICONV"}]
-              , ["GIT_SSH", {"type": "var", "name": "USE_SSH"}]
-              , [ "GIT_SSH_MEMORY_CREDENTIALS"
-                , {"type": "var", "name": "USE_SSH"}
-                ]
-              , ["GIT_NTLM", {"type": "var", "name": "USE_NTLMCLIENT"}]
-              ]
-            , { "type": "if"
-              , "cond": {"type": "var", "name": "USE_NSEC"}
-              , "then":
-                [ ["GIT_USE_NSEC", 1]
-                , ["GIT_USE_FUTIMENS", 1]
-                , ["GIT_USE_STAT_MTIME_NSEC", 1]
-                , { "type": "if"
-                  , "cond": {"type": "var", "name": "IS_BSD"}
-                  , "then": ["GIT_USE_STAT_MTIMESPEC", 1]
-                  , "else": ["GIT_USE_STAT_MTIM", 1]
-                  }
-                ]
-              }
-            , [ { "type": "case*"
-                , "expr": {"type": "var", "name": "REGEX_BACKEND"}
-                , "case":
-                  [ ["regcomp_l", ["GIT_REGEX_REGCOMP_L", 1]]
-                  , ["regcomp", ["GIT_REGEX_REGCOMP", 1]]
-                  , ["pcre", ["GIT_REGEX_PCRE", 1]]
-                  , ["pcre2", ["GIT_REGEX_PCRE2", 1]]
-                  , ["builtin", ["GIT_REGEX_BUILTIN", 1]]
-                  , [null, ["GIT_REGEX_BUILTIN", 1]]
-                  ]
-                , "default":
-                  { "type": "fail"
-                  , "msg": "The REGEX_BACKEND option provided is not supported"
-                  }
-                }
-              ]
-            , { "type": "case*"
-              , "expr": {"type": "var", "name": "USE_GSSAPI"}
-              , "case":
-                [ ["GSS.framework", [["GIT_GSSFRAMEWORK", 1]]]
-                , ["gssapi", [["GIT_GSSAPI", 1]]]
-                , [false, []]
-                ]
-              , "default":
-                { "type": "fail"
-                , "msg": "Backend asked for in USE_GSSAPI is not supported"
-                }
-              }
-            , { "type": "if"
-              , "cond": {"type": "var", "name": "USE_HTTPS"}
-              , "then":
-                [ ["GIT_HTTPS", 1]
-                , { "type": "case*"
-                  , "expr": {"type": "var", "name": "USE_HTTPS"}
-                  , "case":
-                    [ ["SecureTransport", ["GIT_SECURE_TRANSPORT", 1]]
-                    , ["OpenSSL", ["GIT_OPENSSL", 1]]
-                    , ["mbedTLS", ["GIT_MBEDTLS", 1]]
-                    , ["WinHTTP", ["GIT_WINHTTP", 1]]
-                    ]
-                  , "default":
-                    { "type": "fail"
-                    , "msg": "Backend asked for in USE_HTTPS is not supported"
-                    }
-                  }
-                ]
-              }
-            , { "type": "case*"
-              , "expr": {"type": "var", "name": "USE_SHA1"}
-              , "case":
-                [ ["CollisionDetection", [["GIT_SHA1_COLLISIONDETECT", 1]]]
-                , ["Win32", [["GIT_SHA1_WIN32", 1]]]
-                , ["CommonCrypto", [["GIT_SHA1_COMMON_CRYPTO", 1]]]
-                , ["OpenSSL", [["GIT_SHA1_OPENSSL", 1]]]
-                , ["mbedTLS", [["GIT_SHA1_MBEDTLS", 1]]]
-                ]
-              }
-            , { "type": "case*"
-              , "expr": {"type": "var", "name": "USE_SHA256"}
-              , "case":
-                [ ["Builtin", [["GIT_SHA256_BUILTIN", 1]]]
-                , ["Win32", [["GIT_SHA256_WIN32", 1]]]
-                , ["CommonCrypto", [["GIT_SHA256_COMMON_CRYPTO", 1]]]
-                , ["OpenSSL", [["GIT_SHA256_OPENSSL", 1]]]
-                , ["mbedTLS", [["GIT_SHA256_MBEDTLS", 1]]]
-                ]
-              }
-            ]
-          }
-        ]
-      ]
-    , "body": {"type": "env", "vars": ["defines1"]}
-    }
-  }
-, "feature_header":
-  { "type": ["@", "rules", "CC/auto", "config"]
-  , "name": ["features.h"]
-  , "guard": ["INCLUDE_features_h__"]
-  , "stage": ["sys"]
-  }
-, "TREE":
+{ "TREE":
   { "type": "tree"
   , "name": "git2"
   , "deps":
@@ -247,7 +93,7 @@
     , "sys/repository.h"
     , "sys/stream.h"
     , "sys/transport.h"
-    , "sys/features.h"
+    , ["src/libgit2", "experimental.h"]
     ]
   }
 }
diff --git a/etc/import/src/libgit2/TARGETS.git2 b/etc/import/src/libgit2/TARGETS.git2
index 67d4b772..075f3f12 100644
--- a/etc/import/src/libgit2/TARGETS.git2
+++ b/etc/import/src/libgit2/TARGETS.git2
@@ -1,259 +1,33 @@
 { "libgit2_private_headers":
   { "type": ["@", "rules", "data", "staged"]
   , "srcs":
-    [ "annotated_commit.h"
-    , "apply.h"
-    , "attr.h"
-    , "attr_file.h"
-    , "attrcache.h"
-    , "blame.h"
-    , "blame_git.h"
-    , "blob.h"
-    , "branch.h"
-    , "buf.h"
-    , "cache.h"
-    , "checkout.h"
-    , "clone.h"
-    , "commit.h"
-    , "commit_graph.h"
-    , "commit_list.h"
-    , "common.h"
-    , "config.h"
-    , "config_backend.h"
-    , "config_entries.h"
-    , "config_parse.h"
-    , "delta.h"
-    , "diff.h"
-    , "diff_driver.h"
-    , "diff_file.h"
-    , "diff_generate.h"
-    , "diff_parse.h"
-    , "diff_stats.h"
-    , "diff_tform.h"
-    , "diff_xdiff.h"
-    , "email.h"
-    , "errors.h"
-    , "fetch.h"
-    , "fetchhead.h"
-    , "filter.h"
-    , "idxmap.h"
-    , "ignore.h"
-    , "index.h"
-    , "indexer.h"
-    , "iterator.h"
-    , "libgit2.h"
-    , "mailmap.h"
-    , "merge.h"
-    , "merge_driver.h"
-    , "midx.h"
-    , "mwindow.h"
-    , "netops.h"
-    , "notes.h"
-    , "object.h"
-    , "odb.h"
-    , "offmap.h"
-    , "oid.h"
-    , "oidarray.h"
-    , "oidmap.h"
-    , "pack-objects.h"
-    , "pack.h"
-    , "parse.h"
-    , "patch.h"
-    , "patch_generate.h"
-    , "patch_parse.h"
-    , "path.h"
-    , "pathspec.h"
-    , "proxy.h"
-    , "push.h"
-    , "reader.h"
-    , "refdb.h"
-    , "reflog.h"
-    , "refs.h"
-    , "refspec.h"
-    , "remote.h"
-    , "repo_template.h"
-    , "repository.h"
-    , "revwalk.h"
-    , "settings.h"
-    , "signature.h"
-    , "status.h"
-    , "stream.h"
-    , "submodule.h"
-    , "sysdir.h"
-    , "tag.h"
-    , "threadstate.h"
-    , "trace.h"
-    , "transaction.h"
-    , "tree-cache.h"
-    , "tree.h"
-    , "userdiff.h"
-    , "worktree.h"
-    , "streams/mbedtls.h"
-    , "streams/openssl.h"
-    , "streams/openssl_dynamic.h"
-    , "streams/openssl_legacy.h"
-    , "streams/registry.h"
-    , "streams/socket.h"
-    , "streams/stransport.h"
-    , "streams/tls.h"
-    , "transports/auth.h"
-    , "transports/auth_negotiate.h"
-    , "transports/auth_ntlm.h"
-    , "transports/http.h"
-    , "transports/httpclient.h"
-    , "transports/smart.h"
-    , "transports/ssh.h"
-    , "xdiff/git-xdiff.h"
-    , "xdiff/xdiff.h"
-    , "xdiff/xdiffi.h"
-    , "xdiff/xemit.h"
-    , "xdiff/xinclude.h"
-    , "xdiff/xmacros.h"
-    , "xdiff/xprepare.h"
-    , "xdiff/xtypes.h"
-    , "xdiff/xutils.h"
+    [ ["GLOB", null, "*.h"]
+    , ["./", "streams", "hdrs"]
+    , ["./", "transports", "hdrs"]
     , ["src/util", "util_private_headers"]
+    , "experimental.h"
     ]
   }
 , "libgit2_sources":
   { "type": ["@", "rules", "data", "staged"]
   , "srcs":
-    [ "annotated_commit.c"
-    , "apply.c"
-    , "attr.c"
-    , "attr_file.c"
-    , "attrcache.c"
-    , "blame.c"
-    , "blame_git.c"
-    , "blob.c"
-    , "branch.c"
-    , "buf.c"
-    , "cache.c"
-    , "checkout.c"
-    , "cherrypick.c"
-    , "clone.c"
-    , "commit.c"
-    , "commit_graph.c"
-    , "commit_list.c"
-    , "config.c"
-    , "config_cache.c"
-    , "config_entries.c"
-    , "config_file.c"
-    , "config_mem.c"
-    , "config_parse.c"
-    , "config_snapshot.c"
-    , "crlf.c"
-    , "delta.c"
-    , "describe.c"
-    , "diff.c"
-    , "diff_driver.c"
-    , "diff_file.c"
-    , "diff_generate.c"
-    , "diff_parse.c"
-    , "diff_print.c"
-    , "diff_stats.c"
-    , "diff_tform.c"
-    , "diff_xdiff.c"
-    , "email.c"
-    , "errors.c"
-    , "fetch.c"
-    , "fetchhead.c"
-    , "filter.c"
-    , "graph.c"
-    , "hashsig.c"
-    , "ident.c"
-    , "idxmap.c"
-    , "ignore.c"
-    , "index.c"
-    , "indexer.c"
-    , "iterator.c"
-    , "libgit2.c"
-    , "mailmap.c"
-    , "merge.c"
-    , "merge_driver.c"
-    , "merge_file.c"
-    , "message.c"
-    , "midx.c"
-    , "mwindow.c"
-    , "netops.c"
-    , "notes.c"
-    , "object.c"
-    , "object_api.c"
-    , "odb.c"
-    , "odb_loose.c"
-    , "odb_mempack.c"
-    , "odb_pack.c"
-    , "offmap.c"
-    , "oid.c"
-    , "oidarray.c"
-    , "oidmap.c"
-    , "pack-objects.c"
-    , "pack.c"
-    , "parse.c"
-    , "patch.c"
-    , "patch_generate.c"
-    , "patch_parse.c"
-    , "path.c"
-    , "pathspec.c"
-    , "proxy.c"
-    , "push.c"
-    , "reader.c"
-    , "rebase.c"
-    , "refdb.c"
-    , "refdb_fs.c"
-    , "reflog.c"
-    , "refs.c"
-    , "refspec.c"
-    , "remote.c"
-    , "repository.c"
-    , "reset.c"
-    , "revert.c"
-    , "revparse.c"
-    , "revwalk.c"
-    , "signature.c"
-    , "stash.c"
-    , "status.c"
-    , "strarray.c"
-    , "submodule.c"
-    , "sysdir.c"
-    , "tag.c"
-    , "threadstate.c"
-    , "trace.c"
-    , "trailer.c"
-    , "transaction.c"
-    , "transport.c"
-    , "tree-cache.c"
-    , "tree.c"
-    , "worktree.c"
-    , "streams/mbedtls.c"
-    , "streams/openssl.c"
-    , "streams/openssl_dynamic.c"
-    , "streams/openssl_legacy.c"
-    , "streams/registry.c"
-    , "streams/socket.c"
-    , "streams/stransport.c"
-    , "streams/tls.c"
-    , "transports/auth.c"
-    , "transports/auth_negotiate.c"
-    , "transports/auth_ntlm.c"
-    , "transports/credential.c"
-    , "transports/credential_helpers.c"
-    , "transports/git.c"
-    , "transports/http.c"
-    , "transports/httpclient.c"
-    , "transports/local.c"
-    , "transports/smart.c"
-    , "transports/smart_pkt.c"
-    , "transports/smart_protocol.c"
-    , "transports/ssh.c"
-    , "transports/winhttp.c"
-    , "xdiff/xdiffi.c"
-    , "xdiff/xemit.c"
-    , "xdiff/xhistogram.c"
-    , "xdiff/xmerge.c"
-    , "xdiff/xpatience.c"
-    , "xdiff/xprepare.c"
-    , "xdiff/xutils.c"
+    [ ["GLOB", null, "*.c"]
+    , ["./", "streams", "srcs"]
+    , ["./", "transports", "srcs"]
     ]
   }
+, "experimental.h":
+  { "type": "configure"
+  , "target": "experimental"
+  , "config":
+    { "type": "let*"
+    , "bindings": [["defines1", [["GIT_EXPERIMENTAL_SHA256", 0]]]]
+    , "body": {"type": "env", "vars": []}
+    }
+  }
+, "experimental":
+  { "type": ["@", "rules", "CC/auto", "config"]
+  , "name": ["experimental.h"]
+  , "guard": ["INCLUDE_experimental_h__"]
+  }
 }
diff --git a/etc/import/src/libgit2/streams/TARGETS.git2 b/etc/import/src/libgit2/streams/TARGETS.git2
new file mode 100644
index 00000000..d30ccdda
--- /dev/null
+++ b/etc/import/src/libgit2/streams/TARGETS.git2
@@ -0,0 +1,11 @@
+{ "srcs":
+  { "type": ["@", "rules", "data", "staged"]
+  , "stage": ["streams"]
+  , "srcs": [["GLOB", null, "*.c"]]
+  }
+, "hdrs":
+  { "type": ["@", "rules", "data", "staged"]
+  , "stage": ["streams"]
+  , "srcs": [["GLOB", null, "*.h"]]
+  }
+}
diff --git a/etc/import/src/libgit2/transports/TARGETS.git2 b/etc/import/src/libgit2/transports/TARGETS.git2
new file mode 100644
index 00000000..3685401d
--- /dev/null
+++ b/etc/import/src/libgit2/transports/TARGETS.git2
@@ -0,0 +1,11 @@
+{ "srcs":
+  { "type": ["@", "rules", "data", "staged"]
+  , "stage": ["transports"]
+  , "srcs": [["GLOB", null, "*.c"]]
+  }
+, "hdrs":
+  { "type": ["@", "rules", "data", "staged"]
+  , "stage": ["transports"]
+  , "srcs": [["GLOB", null, "*.h"]]
+  }
+}
diff --git a/etc/import/src/util/TARGETS.git2 b/etc/import/src/util/TARGETS.git2
index c03fd06e..cac75649 100644
--- a/etc/import/src/util/TARGETS.git2
+++ b/etc/import/src/util/TARGETS.git2
@@ -23,6 +23,7 @@
     , "regexp.h"
     , "runtime.h"
     , "sortedcache.h"
+    , "staticstr.h"
     , "str.h"
     , "strmap.h"
     , "strnlen.h"
@@ -65,11 +66,13 @@
     , "win32/w32_util.h"
     , "win32/win32-compat.h"
     , ["include", "git2_public_headers"]
+    , "git2_features.h"
+    , ["deps/xdiff", "hdrs"]
     ]
   }
 , "util_os_unix":
   { "type": ["@", "rules", "CC", "library"]
-  , "arguments_config": ["OS", "THREADSAFE"]
+  , "arguments_config": ["OS", "USE_THREADS"]
   , "name": ["util_os_unix"]
   , "pure C": ["yes"]
   , "srcs": ["unix/map.c", "unix/realpath.c"]
@@ -78,7 +81,7 @@
     { "type": "++"
     , "$1":
       [ { "type": "if"
-        , "cond": {"type": "var", "name": "THREADSAFE"}
+        , "cond": {"type": "var", "name": "USE_THREADS"}
         , "then": ["-pthread"]
         }
       , { "type": "case"
@@ -465,6 +468,171 @@
     , "allocators/failalloc.c"
     , "allocators/stdalloc.c"
     , "allocators/win32_leakcheck.c"
+    , ["deps/xdiff", "srcs"]
     ]
   }
+, "git2_features.h":
+  { "type": "configure"
+  , "arguments_config":
+    [ "OS"
+    , "ARCH"
+    , "TARGET_ARCH"
+    , "DEBUG_POOL"
+    , "USE_THREADS"
+    , "REGEX_BACKEND"
+    , "USE_ICONV"
+    , "USE_NSEC"
+    , "USE_SSH"
+    , "USE_NTLMCLIENT"
+    , "USE_GSSAPI"
+    , "USE_SHA1"
+    , "USE_SHA256"
+    , "USE_HTTPS"
+    ]
+  , "target": "feature_header"
+  , "config":
+    { "type": "let*"
+    , "bindings":
+      [ [ "TARGET_ARCH"
+        , { "type": "var"
+          , "name": "TARGET_ARCH"
+          , "default": {"type": "var", "name": "ARCH"}
+          }
+        ]
+      , [ "IS_BSD"
+        , { "type": "case"
+          , "expr": {"type": "var", "name": "OS"}
+          , "case": {"darwin": true, "bsd": true}
+          }
+        ]
+      , [ "IS_32BIT"
+        , { "type": "case"
+          , "expr":
+            { "type": "var"
+            , "name": "TARGET_ARCH"
+            , "default": {"type": "var", "name": "ARCH"}
+            }
+          , "case": {"x86": true, "arm": true}
+          }
+        ]
+      , [ "defines1"
+        , { "type": "++"
+          , "$1":
+            [ [ ["GIT_DEBUG_POOL", {"type": "var", "name": "DEBUG_POOL"}]
+              , ["GIT_THREADS", {"type": "var", "name": "USE_THREADS"}]
+              , { "type": "if"
+                , "cond": {"type": "var", "name": "IS_32BIT"}
+                , "then": ["GIT_ARCH_32", 1]
+                , "else": ["GIT_ARCH_64", 1]
+                }
+              , ["GIT_USE_ICONV", {"type": "var", "name": "USE_ICONV"}]
+              , ["GIT_SSH", {"type": "var", "name": "USE_SSH"}]
+              , [ "GIT_SSH_MEMORY_CREDENTIALS"
+                , {"type": "var", "name": "USE_SSH"}
+                ]
+              , ["GIT_NTLM", {"type": "var", "name": "USE_NTLMCLIENT"}]
+              , [ "GIT_IO_WSAPOLL"
+                , { "type": "=="
+                  , "$1": {"type": "var", "name": "OS"}
+                  , "$2": "windows"
+                  }
+                ]
+              ]
+            , { "type": "if"
+              , "cond": {"type": "var", "name": "USE_NSEC"}
+              , "then":
+                [ ["GIT_USE_NSEC", 1]
+                , ["GIT_USE_FUTIMENS", 1]
+                , ["GIT_USE_STAT_MTIME_NSEC", 1]
+                , { "type": "if"
+                  , "cond": {"type": "var", "name": "IS_BSD"}
+                  , "then": ["GIT_USE_STAT_MTIMESPEC", 1]
+                  , "else": ["GIT_USE_STAT_MTIM", 1]
+                  }
+                ]
+              }
+            , [ { "type": "case*"
+                , "expr": {"type": "var", "name": "REGEX_BACKEND"}
+                , "case":
+                  [ ["regcomp_l", ["GIT_REGEX_REGCOMP_L", 1]]
+                  , ["regcomp", ["GIT_REGEX_REGCOMP", 1]]
+                  , ["pcre", ["GIT_REGEX_PCRE", 1]]
+                  , ["pcre2", ["GIT_REGEX_PCRE2", 1]]
+                  , ["builtin", ["GIT_REGEX_BUILTIN", 1]]
+                  , [null, ["GIT_REGEX_BUILTIN", 1]]
+                  ]
+                , "default":
+                  { "type": "fail"
+                  , "msg": "The REGEX_BACKEND option provided is not supported"
+                  }
+                }
+              ]
+            , { "type": "case*"
+              , "expr": {"type": "var", "name": "USE_GSSAPI"}
+              , "case":
+                [ ["GSS.framework", [["GIT_GSSFRAMEWORK", 1]]]
+                , ["gssapi", [["GIT_GSSAPI", 1]]]
+                , [false, []]
+                ]
+              , "default":
+                { "type": "fail"
+                , "msg": "Backend asked for in USE_GSSAPI is not supported"
+                }
+              }
+            , { "type": "if"
+              , "cond": {"type": "var", "name": "USE_HTTPS"}
+              , "then":
+                [ ["GIT_HTTPS", 1]
+                , { "type": "case*"
+                  , "expr": {"type": "var", "name": "USE_HTTPS"}
+                  , "case":
+                    [ ["SecureTransport", ["GIT_SECURE_TRANSPORT", 1]]
+                    , ["OpenSSL", ["GIT_OPENSSL", 1]]
+                    , ["mbedTLS", ["GIT_MBEDTLS", 1]]
+                    , ["WinHTTP", ["GIT_WINHTTP", 1]]
+                    ]
+                  , "default":
+                    { "type": "fail"
+                    , "msg": "Backend asked for in USE_HTTPS is not supported"
+                    }
+                  }
+                ]
+              }
+            , { "type": "case*"
+              , "expr": {"type": "var", "name": "USE_SHA1"}
+              , "case":
+                [ ["CollisionDetection", [["GIT_SHA1_COLLISIONDETECT", 1]]]
+                , ["Win32", [["GIT_SHA1_WIN32", 1]]]
+                , ["CommonCrypto", [["GIT_SHA1_COMMON_CRYPTO", 1]]]
+                , ["OpenSSL", [["GIT_SHA1_OPENSSL", 1]]]
+                , ["mbedTLS", [["GIT_SHA1_MBEDTLS", 1]]]
+                ]
+              }
+            , { "type": "case*"
+              , "expr": {"type": "var", "name": "USE_SHA256"}
+              , "case":
+                [ ["Builtin", [["GIT_SHA256_BUILTIN", 1]]]
+                , ["Win32", [["GIT_SHA256_WIN32", 1]]]
+                , ["CommonCrypto", [["GIT_SHA256_COMMON_CRYPTO", 1]]]
+                , ["OpenSSL", [["GIT_SHA256_OPENSSL", 1]]]
+                , ["mbedTLS", [["GIT_SHA256_MBEDTLS", 1]]]
+                ]
+              }
+            ]
+          }
+        ]
+      , [ "have_csymbol"
+        , [ ["GIT_IO_POLL", ["poll", ["poll.h"]]]
+          , ["GIT_IO_SELECT", ["select", ["sys/select.h"]]]
+          ]
+        ]
+      ]
+    , "body": {"type": "env", "vars": ["defines1", "have_csymbol"]}
+    }
+  }
+, "feature_header":
+  { "type": ["@", "rules", "CC/auto", "config"]
+  , "name": ["git2_features.h"]
+  , "guard": ["INCLUDE_features_h__"]
+  }
 }
diff --git a/etc/repos.json b/etc/repos.json
index c28134ff..1b00ea63 100644
--- a/etc/repos.json
+++ b/etc/repos.json
@@ -407,11 +407,11 @@
   , "com_github_libgit2_libgit2":
     { "repository":
       { "type": "archive"
-      , "content": "0c7c845401ae9ad63c5617da6df7e84145b699a0"
-      , "fetch": "https://github.com/libgit2/libgit2/archive/refs/tags/v1.5.2.tar.gz"
-      , "sha256": "57638ac0e319078f56a7e17570be754515e5b1276d3750904b4214c92e8fa196"
-      , "sha512": "0de5e82953482bf57e9cd221406581a12c6acfbeeea0cebbb9b701d288804ec085b7c0902ba1f04ad7cdaaead9d472be21ffe8d730050db5c77101a93448fb3a"
-      , "subdir": "libgit2-1.5.2"
+      , "content": "02793bbe15088985989d1ff636a23958f4a62c57"
+      , "fetch": "https://github.com/libgit2/libgit2/archive/refs/tags/v1.7.0.tar.gz"
+      , "sha256": "d9d0f84a86bf98b73e68997f5c1543cc5067d0ca9c7a5acaba3e8d117ecefef3"
+      , "sha512": "68c8ed289de7daccaec17ea2ac49f4610325595cf90cddef763a31546a0a1c6bd400bf6180b68e2d3a8bdc3d031328efbbbaf3b61467dfc1b944e8cf3efcfd69"
+      , "subdir": "libgit2-1.7.0"
       }
     , "target_root": "import targets"
     , "target_file_name": "TARGETS.git2"