diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2022-11-19 14:07:38 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-11-21 04:06:15 +0100 |
| commit | 07047d68294769d5e8700fc200ac326a21d04f8e (patch) | |
| tree | 127e54f371d37d63ee8920d25bba062a8cd30ceb /builtin/read-tree.c | |
| parent | cache.h & test-tool.h: add & use "USE_THE_INDEX_VARIABLE" (diff) | |
| download | git-07047d68294769d5e8700fc200ac326a21d04f8e.tar.xz git-07047d68294769d5e8700fc200ac326a21d04f8e.zip | |
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>
Diffstat (limited to 'builtin/read-tree.c')
| -rw-r--r-- | builtin/read-tree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/read-tree.c b/builtin/read-tree.c index c50b563e2b..f702f9d47b 100644 --- a/builtin/read-tree.c +++ b/builtin/read-tree.c @@ -4,7 +4,7 @@ * Copyright (C) Linus Torvalds, 2005 */ -#define USE_THE_INDEX_COMPATIBILITY_MACROS +#define USE_THE_INDEX_VARIABLE #include "cache.h" #include "config.h" #include "lockfile.h" @@ -176,7 +176,7 @@ int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix) prepare_repo_settings(the_repository); the_repository->settings.command_requires_full_index = 0; - hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR); + repo_hold_locked_index(the_repository, &lock_file, LOCK_DIE_ON_ERROR); /* * NEEDSWORK |