mirror of
https://github.com/git/git.git
synced 2026-01-10 10:13:33 +00:00
cocci: apply "pending" index-compatibility to some "builtin/*.c"
Apply "index-compatibility.pending.cocci" rule to "builtin/*", but
exclude those where we conflict with in-flight changes.
As a result some of them end up using only "the_index", so let's have
them use the more narrow "USE_THE_INDEX_VARIABLE" rather than
"USE_THE_INDEX_COMPATIBILITY_MACROS".
Manual changes not made by coccinelle, that were squashed in:
* Whitespace-wrap argument lists for repo_hold_locked_index(),
repo_read_index_preload() and repo_refresh_and_write_index(), in cases
where the line became too long after the transformation.
* Change "refresh_cache()" to "refresh_index()" in a comment in
"builtin/update-index.c".
* For those whose call was followed by perror("<macro-name>"), change
it to perror("<function-name>"), referring to the new function.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
bdafeae0b9
commit
07047d6829
@@ -26,11 +26,27 @@ identifier f != prepare_to_commit;
|
||||
(
|
||||
- read_cache_unmerged
|
||||
+ repo_read_index_unmerged
|
||||
|
|
||||
- hold_locked_index
|
||||
+ repo_hold_locked_index
|
||||
)
|
||||
(
|
||||
+ the_repository,
|
||||
...)
|
||||
|
||||
// "the_repository" special-cases
|
||||
@@
|
||||
@@
|
||||
(
|
||||
- read_cache_preload
|
||||
+ repo_read_index_preload
|
||||
)
|
||||
(
|
||||
+ the_repository,
|
||||
...
|
||||
+ , 0
|
||||
)
|
||||
|
||||
// "the_index" simple cases
|
||||
@@
|
||||
@@
|
||||
@@ -80,3 +96,40 @@ identifier f != prepare_to_commit;
|
||||
(
|
||||
+ &the_index,
|
||||
...)
|
||||
|
||||
@@
|
||||
@@
|
||||
(
|
||||
- refresh_and_write_cache
|
||||
+ repo_refresh_and_write_index
|
||||
)
|
||||
(
|
||||
+ the_repository,
|
||||
...
|
||||
+ , NULL, NULL, NULL
|
||||
)
|
||||
|
||||
// "the_index" special-cases
|
||||
@@
|
||||
@@
|
||||
(
|
||||
- read_cache_from
|
||||
+ read_index_from
|
||||
)
|
||||
(
|
||||
+ &the_index,
|
||||
...
|
||||
+ , get_git_dir()
|
||||
)
|
||||
|
||||
@@
|
||||
@@
|
||||
(
|
||||
- refresh_cache
|
||||
+ refresh_index
|
||||
)
|
||||
(
|
||||
+ &the_index,
|
||||
...
|
||||
+ , NULL, NULL, NULL
|
||||
)
|
||||
|
||||
@@ -4,9 +4,6 @@
|
||||
(
|
||||
- read_cache
|
||||
+ repo_read_index
|
||||
|
|
||||
- hold_locked_index
|
||||
+ repo_hold_locked_index
|
||||
)
|
||||
(
|
||||
+ the_repository,
|
||||
@@ -25,54 +22,3 @@
|
||||
(
|
||||
+ &the_index,
|
||||
...)
|
||||
|
||||
// "the_repository" special-cases
|
||||
@@
|
||||
@@
|
||||
(
|
||||
- read_cache_preload
|
||||
+ repo_read_index_preload
|
||||
)
|
||||
(
|
||||
+ the_repository,
|
||||
...
|
||||
+ , 0
|
||||
)
|
||||
|
||||
@@
|
||||
@@
|
||||
(
|
||||
- refresh_and_write_cache
|
||||
+ repo_refresh_and_write_index
|
||||
)
|
||||
(
|
||||
+ the_repository,
|
||||
...
|
||||
+ , NULL, NULL, NULL
|
||||
)
|
||||
|
||||
|
||||
// "the_index" special-cases
|
||||
@@
|
||||
@@
|
||||
(
|
||||
- read_cache_from
|
||||
+ read_index_from
|
||||
)
|
||||
(
|
||||
+ &the_index,
|
||||
...
|
||||
+ , get_git_dir()
|
||||
)
|
||||
|
||||
@@
|
||||
@@
|
||||
(
|
||||
- refresh_cache
|
||||
+ refresh_index
|
||||
)
|
||||
(
|
||||
+ &the_index,
|
||||
...
|
||||
+ , NULL, NULL, NULL
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user