merge(3p/git): Merge git subtree at v2.29.2 r/1890

This also bumps the stable nixpkgs to 20.09 as of 2020-11-21, because
there is some breakage in the git build related to the netrc
credentials helper which someone has taken care of in nixpkgs.

The stable channel is not used for anything other than git, so this
should be fine.

Change-Id: I3575a19dab09e1e9556cf8231d717de9890484fb

1 files changed, 0 insertions, 29 deletions

diff --git a/third_party/git/sha1-array.h b/third_party/git/sha1-array.h
deleted file mode 100644
index 55d016c4bf7b..000000000000
--- a/third_party/git/sha1-array.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef SHA1_ARRAY_H
-#define SHA1_ARRAY_H
-
-struct oid_array {
-	struct object_id *oid;
-	int nr;
-	int alloc;
-	int sorted;
-};
-
-#define OID_ARRAY_INIT { NULL, 0, 0, 0 }
-
-void oid_array_append(struct oid_array *array, const struct object_id *oid);
-int oid_array_lookup(struct oid_array *array, const struct object_id *oid);
-void oid_array_clear(struct oid_array *array);
-
-typedef int (*for_each_oid_fn)(const struct object_id *oid,
-			       void *data);
-int oid_array_for_each(struct oid_array *array,
-		       for_each_oid_fn fn,
-		       void *data);
-int oid_array_for_each_unique(struct oid_array *array,
-			      for_each_oid_fn fn,
-			      void *data);
-void oid_array_filter(struct oid_array *array,
-		      for_each_oid_fn want,
-		      void *cbdata);
-
-#endif /* SHA1_ARRAY_H */