Revert "Merge branch 'ra/rebase-i-more-options'"

[thirdparty/git.git] / builtin / rebase.c

diff --git a/builtin/rebase.c b/builtin/rebase.c
index e755087b0f1ebe11472ab4e4ef7165a4714e4e2f..8081741f8aac4e64010ae11871078917b5d535e8 100644 (file)
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -117,6 +117,11 @@ static struct replay_opts get_replay_opts(const struct rebase_options *opts)
        if (opts->strategy_opts)
                parse_strategy_opts(&replay, opts->strategy_opts);
 
+       if (opts->squash_onto) {
+               oidcpy(&replay.squash_onto, opts->squash_onto);
+               replay.have_squash_onto = 1;
+       }
+
        return replay;
 }
 
@@ -685,7 +690,7 @@ static int rebase_write_basic_state(struct rebase_options *opts)
                write_file(state_dir_path("gpg_sign_opt", opts), "%s",
                           opts->gpg_sign_opt);
        if (opts->signoff)
-               write_file(state_dir_path("strategy", opts), "--signoff");
+               write_file(state_dir_path("signoff", opts), "--signoff");
 
        return 0;
 }
@@ -1012,7 +1017,8 @@ static int run_am(struct rebase_options *opts)
        argv_array_pushl(&format_patch.args, "format-patch", "-k", "--stdout",
                         "--full-index", "--cherry-pick", "--right-only",
                         "--src-prefix=a/", "--dst-prefix=b/", "--no-renames",
-                        "--no-cover-letter", "--pretty=mboxrd", "--topo-order", NULL);
+                        "--no-cover-letter", "--pretty=mboxrd", "--topo-order",
+                        "--no-base", NULL);
        if (opts->git_format_patch_opt.len)
                argv_array_split(&format_patch.args,
                                 opts->git_format_patch_opt.buf);