mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-28 12:34:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

built-in rebase --skip/--abort: clean up stale .git/<name> files

Browse Source 
The scripted version of the rebase used to execute `git reset --hard`
when skipping or aborting. When we ported this to C, we did update the
worktree and some reflogs, but we failed to imitate `git reset --hard`'s
behavior regarding files in .git/ such as MERGE_HEAD.

Let's address this oversight.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin 2018-11-12 15:26:01 -08:00 committed by Junio C Hamano
parent 69c92209d2
commit 5aec9271d3
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/rebase.c
View File

@ -23,6 +23,7 @@
#include "revision.h" #include "revision.h"
#include "commit-reach.h" #include "commit-reach.h"
#include "rerere.h" #include "rerere.h"
#include "branch.h"
static char const * const builtin_rebase_usage[] = { static char const * const builtin_rebase_usage[] = {
N_("git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] " N_("git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] "
@ -1002,6 +1003,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
if (reset_head(NULL, "reset", NULL, 0, NULL, NULL) < 0) if (reset_head(NULL, "reset", NULL, 0, NULL, NULL) < 0)
die(_("could not discard worktree changes")); die(_("could not discard worktree changes"));
remove_branch_state();
if (read_basic_state(&options)) if (read_basic_state(&options))
exit(1); exit(1);
goto run_rebase; goto run_rebase;
@ -1019,6 +1021,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
options.head_name, 0, NULL, NULL) < 0) options.head_name, 0, NULL, NULL) < 0)
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();
ret = finish_rebase(&options); ret = finish_rebase(&options);
goto cleanup; goto cleanup;
} }