development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-28 03:59:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

cocci: fix incorrect & verbose "the_repository" rules

Browse source 
When these rules started being added in [1] they didn't use a ";"
after the ")", and would thus catch uses of these macros within
expressions. But as of [2] the new additions were broken in that
they'd only match a subset of the users of these macros.

Rather than narrowly fixing that, let's have these use the much less
verbose pattern introduced in my recent [3]: There's no need to
exhaustively enumerate arguments if we use the "..." syntax. This
means that we can fold all of these different rules into one.

1. afd69dcc21 (object-store: prepare read_object_file to deal with
   any repo, 2018-11-13)
2. 21a9651ba3 (commit-reach: prepare get_merge_bases to handle any
   repo, 2018-11-13)
3. 0e6550a2c6 (cocci: add a index-compatibility.pending.cocci,
   2022-11-19)

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2023-03-28 15:58:43 +02:00 committed by Junio C Hamano
parent 49c2d93ecf
commit 6f1436ba2a
1 changed files with 46 additions and 114 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

160
contrib/coccinelle/the_repository.pending.cocci
View file

@ -3,118 +3,50 @@
// our code base. // our code base.
@@ @@
expression E;
expression F;
expression G;
@@ @@
- read_object_file( (
+ repo_read_object_file(the_repository, - read_object_file
E, F, G) + repo_read_object_file
|
@@ - has_object_file
expression E; + repo_has_object_file
@@ |
- has_object_file( - has_object_file_with_flags
+ repo_has_object_file(the_repository, + repo_has_object_file_with_flags
E) |
- parse_commit_internal
@@ + repo_parse_commit_internal
expression E; |
@@ - parse_commit
- has_object_file_with_flags( + repo_parse_commit
+ repo_has_object_file_with_flags(the_repository, |
E) - get_merge_bases
+ repo_get_merge_bases
@@ |
expression E; - get_merge_bases_many
expression F; + repo_get_merge_bases_many
expression G; |
@@ - get_merge_bases_many_dirty
- parse_commit_internal( + repo_get_merge_bases_many_dirty
+ repo_parse_commit_internal(the_repository, |
E, F, G) - in_merge_bases
+ repo_in_merge_bases
@@ |
expression E; - in_merge_bases_many
@@ + repo_in_merge_bases_many
- parse_commit( |
+ repo_parse_commit(the_repository, - get_commit_buffer
E) + repo_get_commit_buffer
|
@@ - unuse_commit_buffer
expression E; + repo_unuse_commit_buffer
expression F; |
@@ - logmsg_reencode
- get_merge_bases( + repo_logmsg_reencode
+ repo_get_merge_bases(the_repository, |
E, F); - format_commit_message
+ repo_format_commit_message
@@ )
expression E; (
expression F; + the_repository,
expression G; ...)
@@
- get_merge_bases_many(
+ repo_get_merge_bases_many(the_repository,
E, F, G);
@@
expression E;
expression F;
expression G;
@@
- get_merge_bases_many_dirty(
+ repo_get_merge_bases_many_dirty(the_repository,
E, F, G);
@@
expression E;
expression F;
@@
- in_merge_bases(
+ repo_in_merge_bases(the_repository,
E, F);
@@
expression E;
expression F;
expression G;
@@
- in_merge_bases_many(
+ repo_in_merge_bases_many(the_repository,
E, F, G);
@@
expression E;
expression F;
@@
- get_commit_buffer(
+ repo_get_commit_buffer(the_repository,
E, F);
@@
expression E;
expression F;
@@
- unuse_commit_buffer(
+ repo_unuse_commit_buffer(the_repository,
E, F);
@@
expression E;
expression F;
expression G;
@@
- logmsg_reencode(
+ repo_logmsg_reencode(the_repository,
E, F, G);
@@
expression E;
expression F;
expression G;
expression H;
@@
- format_commit_message(
+ repo_format_commit_message(the_repository,
E, F, G, H);