mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

read-cache API & users: make discard_index() return void

Browse Source 
The discard_index() function has not returned non-zero since
7a51ed66f6 (Make on-disk index representation separate from in-core
one, 2008-01-14), but we've had various code in-tree still acting as
though that might be the case.

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
2022-11-19 14:07:31 +01:00
committed by Junio C Hamano
parent fbc1ed629e
commit 9c5f3ee3b3
6 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sequencer.c
View File

@ -3564,7 +3564,8 @@ static int do_exec(struct repository *r, const char *command_line)
status = run_command(&cmd);
/* force re-reading of the cache */
if (discard_index(r->index) < 0 || repo_read_index(r) < 0)
discard_index(r->index);
if (repo_read_index(r) < 0)
return error(_("could not read index"));
dirty = require_clean_work_tree(r, "rebase", NULL, 1, 1);
@ -4029,9 +4030,11 @@ static int do_merge(struct repository *r,
ret = run_command(&cmd);
/* force re-reading of the cache */
if (!ret && (discard_index(r->index) < 0 ||
repo_read_index(r) < 0))
ret = error(_("could not read index"));
if (!ret) {
discard_index(r->index);
if (repo_read_index(r) < 0)
ret = error(_("could not read index"));
}
goto leave_merge;
}
@ -4404,8 +4407,8 @@ void create_autostash(struct repository *r, const char *path)
printf(_("Created autostash: %s\n"), buf.buf);
if (reset_head(r, &ropts) < 0)
die(_("could not reset --hard"));
if (discard_index(r->index) < 0 ||
repo_read_index(r) < 0)
discard_index(r->index);
if (repo_read_index(r) < 0)
die(_("could not read index"));
}
strbuf_release(&buf);