diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-11-28 12:13:46 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-11-28 12:13:46 +0900 |
commit | 041df69edd393204c220f3f39d217e284258fd18 (patch) | |
tree | 20760c6a0bcbbec48fcc4a05d8d245581d570e91 /sequencer.c | |
parent | 613999cc5c951bc2c078caad59e339243f119a6e (diff) | |
parent | 07047d68294769d5e8700fc200ac326a21d04f8e (diff) | |
download | git-041df69edd393204c220f3f39d217e284258fd18.tar.gz |
Merge branch 'ab/fewer-the-index-macros'
Progress on removing 'the_index' convenience wrappers.
* ab/fewer-the-index-macros:
cocci: apply "pending" index-compatibility to some "builtin/*.c"
cache.h & test-tool.h: add & use "USE_THE_INDEX_VARIABLE"
{builtin/*,repository}.c: add & use "USE_THE_INDEX_VARIABLE"
cocci: apply "pending" index-compatibility to "t/helper/*.c"
cocci & cache.h: apply variable section of "pending" index-compatibility
cocci & cache.h: apply a selection of "pending" index-compatibility
cocci: add a index-compatibility.pending.cocci
read-cache API & users: make discard_index() return void
cocci & cache.h: remove rarely used "the_index" compat macros
builtin/{grep,log}.: don't define "USE_THE_INDEX_COMPATIBILITY_MACROS"
cache.h: remove unused "the_index" compat macros
Diffstat (limited to 'sequencer.c')
-rw-r--r-- | sequencer.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sequencer.c b/sequencer.c index 54ec90434d..9827e1adcb 100644 --- a/sequencer.c +++ b/sequencer.c @@ -3567,7 +3567,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); @@ -4046,9 +4047,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; } @@ -4421,8 +4424,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); |