development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-25 02:35:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

builtin rebase: support --skip

Browse source 
This commit adds the option `--skip` which is used to restart
rebase after skipping the current patch.

Signed-off-by: Pratik Karki <predatoramigo@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Pratik Karki 2018-08-08 20:51:17 +05:45 committed by Junio C Hamano
parent f95736288a
commit 122420c295
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
builtin/rebase.c
View file

@ -21,6 +21,7 @@
#include "diff.h"
#include "wt-status.h"
#include "revision.h"
#include "rerere.h"
static char const * const builtin_rebase_usage[] = {
N_("git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] "
@ -468,6 +469,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
enum {
NO_ACTION,
ACTION_CONTINUE,
ACTION_SKIP,
} action = NO_ACTION;
struct option builtin_rebase_options[] = {
OPT_STRING(0, "onto", &options.onto_name,
@ -492,6 +494,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
REBASE_FORCE),
OPT_CMDMODE(0, "continue", &action, N_("continue"),
ACTION_CONTINUE),
OPT_CMDMODE(0, "skip", &action,
N_("skip current patch and continue"), ACTION_SKIP),
OPT_END(),
};
@ -590,6 +594,20 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
exit(1);
goto run_rebase;
}
case ACTION_SKIP: {
struct string_list merge_rr = STRING_LIST_INIT_DUP;
options.action = "skip";
rerere_clear(&merge_rr);
string_list_clear(&merge_rr, 1);
if (reset_head(NULL, "reset", NULL, 0) < 0)
die(_("could not discard worktree changes"));
if (read_basic_state(&options))
exit(1);
goto run_rebase;
}
default:
die("TODO");
}