undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase: warn if state directory cannot be removed

Browse Source 
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>
This commit is contained in:
Phillip Wood 2019-05-14 19:03:47 +01:00 committed by Junio C Hamano
parent 7372eaeb8b
commit d3fce47d2d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/rebase.c
View File

@ -760,6 +760,7 @@ static int finish_rebase(struct rebase_options *opts)
{ {
struct strbuf dir = STRBUF_INIT; struct strbuf dir = STRBUF_INIT;
const char *argv_gc_auto[] = { "gc", "--auto", NULL }; const char *argv_gc_auto[] = { "gc", "--auto", NULL };
int ret = 0;
delete_ref(NULL, "REBASE_HEAD", NULL, REF_NO_DEREF); delete_ref(NULL, "REBASE_HEAD", NULL, REF_NO_DEREF);
apply_autostash(opts); 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); run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
strbuf_addstr(&dir, opts->state_dir); 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); strbuf_release(&dir);
return 0; return ret;
} }
static struct commit *peel_committish(const char *name) 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"), die(_("could not move back to %s"),
oid_to_hex(&options.orig_head)); oid_to_hex(&options.orig_head));
remove_branch_state(the_repository); remove_branch_state(the_repository);
ret = finish_rebase(&options); ret = !!finish_rebase(&options);
goto cleanup; goto cleanup;
} }
case ACTION_QUIT: { case ACTION_QUIT: {