[PATCH 10/18] builtin rebase: support `-C` and `--whitespace=`

[Pratik Karki]

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 <predatoram...@gmail.com>
---
 builtin/rebase.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/builtin/rebase.c b/builtin/rebase.c
index cd9caf4841..4437c86513 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -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"),
@@ -640,6 +642,10 @@ int cmd_rebase(int argc, const char **argv, const char 
*prefix)
                            "squash!/fixup! under -i")),
                OPT_STRING('S', "gpg-sign", &gpg_sign,
                           N_("gpg-sign?"), N_("GPG-sign commits")),
+               OPT_STRING_LIST(0, "whitespace", &whitespace,
+                               N_("whitespace"), N_("passed to 'git apply'")),
+               OPT_SET_INT('C', 0, &opt_c, N_("passed to 'git apply'"),
+                           REBASE_AM),
                OPT_END(),
        };
 
@@ -847,6 +853,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:
-- 
2.18.0