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 & cache.h: fully apply "active_nr" part of index-compatibility

Browse source 
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:
Ævar Arnfjörð Bjarmason 2023-02-10 11:28:35 +01:00 committed by Junio C Hamano
parent 6193aaa9f9
commit cec13b9514
3 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
builtin/commit.c
View file

@ -991,7 +991,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
struct object_id oid; struct object_id oid;
const char *parent = "HEAD"; const char *parent = "HEAD";
if (!active_nr) { if (!the_index.cache_nr) {
discard_cache(); discard_cache();
if (read_cache() < 0) if (read_cache() < 0)
die(_("Cannot read index")); die(_("Cannot read index"));

2
cache.h
View file

@ -454,8 +454,6 @@ extern struct index_state the_index;
#ifndef USE_THE_INDEX_VARIABLE #ifndef USE_THE_INDEX_VARIABLE
#ifdef USE_THE_INDEX_COMPATIBILITY_MACROS #ifdef USE_THE_INDEX_COMPATIBILITY_MACROS
#define active_nr (the_index.cache_nr)
#define read_cache() repo_read_index(the_repository) #define read_cache() repo_read_index(the_repository)
#define discard_cache() discard_index(&the_index) #define discard_cache() discard_index(&the_index)
#define cache_name_pos(name, namelen) index_name_pos(&the_index,(name),(namelen)) #define cache_name_pos(name, namelen) index_name_pos(&the_index,(name),(namelen))

13
contrib/coccinelle/index-compatibility.cocci
View file

@ -1,6 +1,7 @@
// the_index.* variables // the_index.* variables
@@ @@
identifier AC = active_cache; identifier AC = active_cache;
identifier AN = active_nr;
identifier ACC = active_cache_changed; identifier ACC = active_cache_changed;
identifier ACT = active_cache_tree; identifier ACT = active_cache_tree;
@@ @@
@ -8,6 +9,9 @@ identifier ACT = active_cache_tree;
- AC - AC
+ the_index.cache + the_index.cache
| |
- AN
+ the_index.cache_nr
|
- ACC - ACC
+ the_index.cache_changed + the_index.cache_changed
| |
@ -15,15 +19,6 @@ identifier ACT = active_cache_tree;
+ the_index.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 // "the_repository" simple cases
@@ @@
@@ @@