v2 fixes commit.cocci, found by Szeder. While at there I see there are two other changes suggested by cocci that haven't made it to 'pu' so I added them in the new 01/32. Nguyễn Thái Ngọc Duy (32): rebase: 'make coccicheck' cleanup packfile.c: add repo_approximate_object_count() refs.c: add refs_ref_exists() refs.c: add refs_shorten_unambiguous_ref() refs.c: remove the_repo from substitute_branch_name() refs.c: remove the_repo from expand_ref() refs.c: add repo_dwim_ref() refs.c: add repo_dwim_log() refs.c: remove the_repo from read_ref_at() commit.c: add repo_get_commit_tree() sha1-name.c: remove the_repo from sort_ambiguous() sha1-name.c: remove the_repo from find_abbrev_len_packed() sha1-name.c: add repo_find_unique_abbrev_r() sha1-name.c: store and use repo in struct disambiguate_state sha1-name.c: add repo_for_each_abbrev() sha1-name.c: remove the_repo from get_short_oid() sha1-name.c: remove the_repo from interpret_nth_prior_checkout() sha1-name.c: remove the_repo from interpret_branch_mark() sha1-name.c: add repo_interpret_branch_name() sha1-name.c: remove the_repo from get_oid_oneline() sha1-name.c: remove the_repo from get_describe_name() sha1-name.c: remove the_repo from get_oid_basic() sha1-name.c: remove the_repo from get_oid_1() sha1-name.c: remove the_repo from handle_one_ref() sha1-name.c: remove the_repo from diagnose_invalid_index_path() sha1-name.c: remove the_repo from resolve_relative_path() sha1-name.c: remove the_repo from get_oid_with_context_1() sha1-name.c: add repo_get_oid() submodule-config.c: use repo_get_oid for reading .gitmodules sha1-name.c: remove the_repo from maybe_die_on_misspelt_object_name sha1-name.c: remove the_repo from other get_oid_* sha1-name.c: remove the_repo from get_oid_mb() builtin/rebase.c | 5 +- builtin/show-branch.c | 6 +- cache.h | 50 ++-- commit.c | 5 +- commit.h | 3 +- contrib/coccinelle/commit.cocci | 4 +- dir.c | 8 + dir.h | 4 +- packfile.c | 14 +- packfile.h | 3 +- refs.c | 71 ++++-- refs.h | 9 +- setup.c | 7 +- sha1-name.c | 388 ++++++++++++++++++----------- submodule-config.c | 20 +- t/t7814-grep-recurse-submodules.sh | 6 +- upload-pack.c | 2 +- 17 files changed, 375 insertions(+), 230 deletions(-) Range-diff dựa trên v1: -: ---------- > 1: b992f6c799 rebase: 'make coccicheck' cleanup 1: 0988bf416e = 2: e76c73a75a packfile.c: add repo_approximate_object_count() 2: d55d5a044d = 3: 962a168516 refs.c: add refs_ref_exists() 3: a01ebfaa28 = 4: d06bea7909 refs.c: add refs_shorten_unambiguous_ref() 4: 6bf6bdb358 = 5: fb880154e6 refs.c: remove the_repo from substitute_branch_name() 5: 7db71d20f0 = 6: 6fd7960522 refs.c: remove the_repo from expand_ref() 6: c0bbe2ea45 = 7: f5ad3133bc refs.c: add repo_dwim_ref() 7: c7b5e8d9fe = 8: 7552a4085a refs.c: add repo_dwim_log() 8: 91229dad66 = 9: 962fff4c9c refs.c: remove the_repo from read_ref_at() 9: ae7d2bfcee ! 10: 68876a150f commit.c: add repo_get_commit_tree() @@ -38,3 +38,22 @@ struct object_id *get_commit_tree_oid(const struct commit *); /* + + diff --git a/contrib/coccinelle/commit.cocci b/contrib/coccinelle/commit.cocci + --- a/contrib/coccinelle/commit.cocci + +++ b/contrib/coccinelle/commit.cocci +@@ + + // These excluded functions must access c->maybe_tree direcly. + @@ +-identifier f !~ "^(get_commit_tree|get_commit_tree_in_graph_one|load_tree_for_commit)$"; ++identifier f !~ "^(repo_get_commit_tree|get_commit_tree_in_graph_one|load_tree_for_commit)$"; + expression c; + @@ + f(...) {<... + - c->maybe_tree +-+ get_commit_tree(c) +++ repo_get_commit_tree(the_repository, c) + ...>} + + @@ 10: b6bd4c86e3 = 11: 9817d150b2 sha1-name.c: remove the_repo from sort_ambiguous() 11: 8aaaf14786 = 12: 7ce23aaeb5 sha1-name.c: remove the_repo from find_abbrev_len_packed() 12: 76305c1faa = 13: 2d99af106f sha1-name.c: add repo_find_unique_abbrev_r() 13: f07d196f41 = 14: f63626e937 sha1-name.c: store and use repo in struct disambiguate_state 14: 0e6ef61f31 = 15: ce9f7ebab8 sha1-name.c: add repo_for_each_abbrev() 15: 0e74d78d74 = 16: 8cb8278d6e sha1-name.c: remove the_repo from get_short_oid() 16: a5d0f20892 = 17: 9210dd01b8 sha1-name.c: remove the_repo from interpret_nth_prior_checkout() 17: 15dd2005b4 = 18: a161ed33d2 sha1-name.c: remove the_repo from interpret_branch_mark() 18: 23627fd251 = 19: 6bf4df0131 sha1-name.c: add repo_interpret_branch_name() 19: 167ac516e8 = 20: 94f707cb7f sha1-name.c: remove the_repo from get_oid_oneline() 20: 57bfc2f7f6 = 21: 2a1dd6368c sha1-name.c: remove the_repo from get_describe_name() 21: 1134a0c34e = 22: f958b565db sha1-name.c: remove the_repo from get_oid_basic() 22: c04c381031 = 23: ec821007b2 sha1-name.c: remove the_repo from get_oid_1() 23: c9a33014f6 = 24: 317a365f30 sha1-name.c: remove the_repo from handle_one_ref() 24: 2f8bd84d50 = 25: 3a46ea22b2 sha1-name.c: remove the_repo from diagnose_invalid_index_path() 25: c2924466da = 26: 59a8cb9749 sha1-name.c: remove the_repo from resolve_relative_path() 26: 3b9545a48c = 27: d1f4df1915 sha1-name.c: remove the_repo from get_oid_with_context_1() 27: 333dc19eae = 28: 3034e9cf1e sha1-name.c: add repo_get_oid() 28: a6b08a7a2d = 29: 9c72941ec9 submodule-config.c: use repo_get_oid for reading .gitmodules 29: 42a0ce718e = 30: 40acfb6b82 sha1-name.c: remove the_repo from maybe_die_on_misspelt_object_name 30: 39aab4331a = 31: 3b8be75e77 sha1-name.c: remove the_repo from other get_oid_* 31: 1d1c4a0d5f = 32: 59cadc5deb sha1-name.c: remove the_repo from get_oid_mb() -- 2.21.0.479.g47ac719cd3