3 files changed, 33 insertions, 17 deletions
diff --git a/third_party/git/contrib/coccinelle/commit.cocci b/third_party/git/contrib/coccinelle/commit.cocci
index 778e4704f6a2..d03453341e84 100644
--- a/third_party/git/contrib/coccinelle/commit.cocci
+++ b/third_party/git/contrib/coccinelle/commit.cocci
@@ -20,7 +20,7 @@ expression s;
 + set_commit_tree(c, s)
   ...>}
 
-// These excluded functions must access c->maybe_tree directly.
+// These excluded functions must access c->maybe_tree direcly.
 // Note that if c->maybe_tree is written somewhere outside of these
 // functions, then the recommended transformation will be bogus with
 // repo_get_commit_tree() on the LHS.
diff --git a/third_party/git/contrib/coccinelle/hashmap.cocci b/third_party/git/contrib/coccinelle/hashmap.cocci
deleted file mode 100644
index d69e120ccffc..000000000000
--- a/third_party/git/contrib/coccinelle/hashmap.cocci
+++ /dev/null
@@ -1,16 +0,0 @@
-@ hashmap_entry_init_usage @
-expression E;
-struct hashmap_entry HME;
-@@
-- HME.hash = E;
-+ hashmap_entry_init(&HME, E);
-
-@@
-identifier f !~ "^hashmap_entry_init$";
-expression E;
-struct hashmap_entry *HMEP;
-@@
-  f(...) {<...
-- HMEP->hash = E;
-+ hashmap_entry_init(HMEP, E);
-  ...>}
diff --git a/third_party/git/contrib/coccinelle/object_id.cocci b/third_party/git/contrib/coccinelle/object_id.cocci
index ddf4f22bd722..3e536a9834b6 100644
--- a/third_party/git/contrib/coccinelle/object_id.cocci
+++ b/third_party/git/contrib/coccinelle/object_id.cocci
@@ -13,6 +13,38 @@ struct object_id *OIDPTR;
 @@
 struct object_id OID;
 @@
+- sha1_to_hex(OID.hash)
++ oid_to_hex(&OID)
+
+@@
+identifier f != oid_to_hex;
+struct object_id *OIDPTR;
+@@
+  f(...) {<...
+- sha1_to_hex(OIDPTR->hash)
++ oid_to_hex(OIDPTR)
+  ...>}
+
+@@
+expression E;
+struct object_id OID;
+@@
+- sha1_to_hex_r(E, OID.hash)
++ oid_to_hex_r(E, &OID)
+
+@@
+identifier f != oid_to_hex_r;
+expression E;
+struct object_id *OIDPTR;
+@@
+   f(...) {<...
+- sha1_to_hex_r(E, OIDPTR->hash)
++ oid_to_hex_r(E, OIDPTR)
+  ...>}
+
+@@
+struct object_id OID;
+@@
 - hashclr(OID.hash)
 + oidclr(&OID)