mirrors/git
1
0
Fork 0
Code Issues Pull Requests 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
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;
const char *parent = "HEAD";
if (!active_nr) {
if (!the_index.cache_nr) {
discard_cache();
if (read_cache() < 0)
die(_("Cannot read index"));