mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-31 14:27:54 +01:00
Code Activity

builtin rebase: support -C and --whitespace=<type>

Browse source 
This commit converts more code from the shell script version to the
builtin rebase. In this instance, we just have to be careful to
keep support for passing multiple `--whitespace` options, as the
shell script version does so, too.

Signed-off-by: Pratik Karki <predatoramigo@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Pratik Karki 2018-09-04 15:00:01 -07:00 committed by Junio C Hamano
parent 12026a412c
commit 7998dbe1ec
1 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
builtin/rebase.c
View file

@ -574,6 +574,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
int ignore_date = 0;
int ignore_whitespace = 0;
const char *gpg_sign = NULL;
int opt_c = -1;
struct string_list whitespace = STRING_LIST_INIT_NODUP;
struct option builtin_rebase_options[] = {
OPT_STRING(0, "onto", &options.onto_name,
N_("revision"),
@ -641,6 +643,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
{ OPTION_STRING, 'S', "gpg-sign", &gpg_sign, N_("key-id"),
N_("GPG-sign commits"),
PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
OPT_STRING_LIST(0, "whitespace", &whitespace,
N_("whitespace"), N_("passed to 'git apply'")),
OPT_SET_INT('C', NULL, &opt_c, N_("passed to 'git apply'"),
REBASE_AM),
OPT_END(),
};
@ -848,6 +854,23 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
options.gpg_sign_opt = xstrfmt("-S%s", gpg_sign);
}
if (opt_c >= 0)
strbuf_addf(&options.git_am_opt, " -C%d", opt_c);
if (whitespace.nr) {
int i;
for (i = 0; i < whitespace.nr; i++) {
const char *item = whitespace.items[i].string;
strbuf_addf(&options.git_am_opt, " --whitespace=%s",
item);
if ((!strcmp(item, "fix")) || (!strcmp(item, "strip")))
options.flags |= REBASE_FORCE;
}
}
switch (options.type) {
case REBASE_MERGE:
case REBASE_INTERACTIVE: