Merge branch 'du/get-tar-commit-id-is-plumbing'

diff --git a/contrib/coccinelle/commit.cocci b/contrib/coccinelle/commit.cocci
index ac38525941fef973ba588c8262a1ba048797042b..c49aa558f0fe6b74b9d4d4a7779f0a9f32747388 100644 (file)
--- a/contrib/coccinelle/commit.cocci
+++ b/contrib/coccinelle/commit.cocci
@@ -10,11 +10,15 @@ expression c;
 - c->maybe_tree->object.oid.hash
 + get_commit_tree_oid(c)->hash
 
+// These excluded functions must access c->maybe_tree direcly.
 @@
+identifier f !~ "^(get_commit_tree|get_commit_tree_in_graph_one|load_tree_for_commit)$";
 expression c;
 @@
+  f(...) {<...
 - c->maybe_tree
 + get_commit_tree(c)
+  ...>}
 
 @@
 expression c;
@@ -22,9 +26,3 @@ expression s;
 @@
 - get_commit_tree(c) = s
 + c->maybe_tree = s
-
-@@
-expression c;
-@@
-- return get_commit_tree(c);
-+ return c->maybe_tree;