Merge branch 'ab/fewer-the-index-macros'

[thirdparty/git.git] / sequencer.c

diff --git a/sequencer.c b/sequencer.c
index 54ec90434db040a8268c95f6ac11c27bc269d0e3..9827e1adcbf0de181b7e3eea9a411d60effc2124 100644 (file)
--- 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);