diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2022-11-19 14:07:33 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-11-21 12:06:15 +0900 |
| commit | 031b2033e0b5c6276bbd93f276e1698f925fb498 (patch) | |
| tree | 213e0ccf758ac82833f6354c22732b358951fc5c /builtin/reset.c | |
| parent | 0e6550a2c631e032c1c283398e50e9e654c171f0 (diff) | |
| download | git-031b2033e0b5c6276bbd93f276e1698f925fb498.tar.gz | |
cocci & cache.h: apply a selection of "pending" index-compatibility
Apply a selection of rules in "index-compatibility.pending.cocci"
tree-wide, and in doing so migrate them to
"index-compatibility.cocci".
As in preceding commits the only manual changes here are the macro
removals in "cache.h", and the update to the '*.cocci" rules. The rest
of the C code changes are the result of applying those updated rules.
Move rules for some rarely used cache compatibility macros from
"index-compatibility.pending.cocci" to "index-compatibility.cocci" and
apply them.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/reset.c')
| -rw-r--r-- | builtin/reset.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin/reset.c b/builtin/reset.c index e561180e8c..59f777a1da 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -145,7 +145,7 @@ static void update_index_from_diff(struct diff_queue_struct *q, struct cache_entry *ce; if (!is_in_reset_tree && !intent_to_add) { - remove_file_from_cache(one->path); + remove_file_from_index(&the_index, one->path); continue; } @@ -172,7 +172,8 @@ static void update_index_from_diff(struct diff_queue_struct *q, ce->ce_flags |= CE_INTENT_TO_ADD; set_object_name_for_intent_to_add_entry(ce); } - add_cache_entry(ce, ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE); + add_index_entry(&the_index, ce, + ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE); } } |