mirror of
https://github.com/git/git.git
synced 2026-01-10 10:13:33 +00:00
cocci & cache.h: fully apply "active_nr" part of index-compatibility
Apply the "active_nr" part of "index-compatibility.pending.cocci", which was left out in [1] due to an in-flight conflict. As of [2] the topic we conflicted with has been merged to "master", so we can fully apply this rule. 1.dc594180d9(cocci & cache.h: apply variable section of "pending" index-compatibility, 2022-11-19) 2.9ea1378d04(Merge branch 'ab/various-leak-fixes', 2022-12-14) 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
6193aaa9f9
commit
cec13b9514
@@ -1,6 +1,7 @@
|
||||
// the_index.* variables
|
||||
@@
|
||||
identifier AC = active_cache;
|
||||
identifier AN = active_nr;
|
||||
identifier ACC = active_cache_changed;
|
||||
identifier ACT = active_cache_tree;
|
||||
@@
|
||||
@@ -8,6 +9,9 @@ identifier ACT = active_cache_tree;
|
||||
- AC
|
||||
+ the_index.cache
|
||||
|
|
||||
- AN
|
||||
+ the_index.cache_nr
|
||||
|
|
||||
- ACC
|
||||
+ the_index.cache_changed
|
||||
|
|
||||
@@ -15,15 +19,6 @@ identifier ACT = active_cache_tree;
|
||||
+ the_index.cache_tree
|
||||
)
|
||||
|
||||
@@
|
||||
identifier AN = active_nr;
|
||||
identifier f != prepare_to_commit;
|
||||
@@
|
||||
f(...) {<...
|
||||
- AN
|
||||
+ the_index.cache_nr
|
||||
...>}
|
||||
|
||||
// "the_repository" simple cases
|
||||
@@
|
||||
@@
|
||||
|
||||
Reference in New Issue
Block a user