diff options
| author |   Phillip Wood <phillip.wood@dunelm.org.uk> | 2019-05-14 19:03:47 +0100 |
|---|---|---|
| committer |   Junio C Hamano <gitster@pobox.com> | 2019-05-15 10:59:33 +0900 |
| commit | d3fce47d2df868287de1a15d769e78db2c3283a9 (patch) | |
| tree | aaa42dfe8aa82760372b010b91a8f0336174c74d | |
| parent | rebase: fix a memory leak (diff) | |
| download | git-d3fce47d2df868287de1a15d769e78db2c3283a9.tar.xz git-d3fce47d2df868287de1a15d769e78db2c3283a9.zip | |
rebase: warn if state directory cannot be removed
If rebase --quit cannot remove the state directory then it dies. However
when rebase finishes normally or the user runs rebase --abort any errors
that occur when removing the state directory are ignored. That is fixed
by this commit.
All of the callers of finish_rebase() except the code
that handles --abort are careful to make sure they get a postive return
value, do the same for --abort.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/rebase.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index a9062c672b9..b5d2e2311c9 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -760,6 +760,7 @@ static int finish_rebase(struct rebase_options *opts) { struct strbuf dir = STRBUF_INIT; const char *argv_gc_auto[] = { "gc", "--auto", NULL }; + int ret = 0; delete_ref(NULL, "REBASE_HEAD", NULL, REF_NO_DEREF); apply_autostash(opts); @@ -770,10 +771,11 @@ static int finish_rebase(struct rebase_options *opts) */ run_command_v_opt(argv_gc_auto, RUN_GIT_CMD); strbuf_addstr(&dir, opts->state_dir); - remove_dir_recursively(&dir, 0); + if (remove_dir_recursively(&dir, 0)) + ret = error(_("could not remove '%s'"), opts->state_dir); strbuf_release(&dir); - return 0; + return ret; } static struct commit *peel_committish(const char *name) @@ -1645,7 +1647,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) die(_("could not move back to %s"), oid_to_hex(&options.orig_head)); remove_branch_state(the_repository); - ret = finish_rebase(&options); + ret = !!finish_rebase(&options); goto cleanup; } case ACTION_QUIT: { |