rebase: put rebase_options initialization in single place

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/rebase.c b/builtin/rebase.c
index d6b20a6a536238b6bd7293d2f2d0260baf9ef6c7..ad5ebecbbdbc8e0d24baf4dffd15e19cd61f4d93 100644 (file)
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -134,6 +134,8 @@ struct rebase_options {
                .exec = STRING_LIST_INIT_NODUP,         \
                .git_format_patch_opt = STRBUF_INIT,    \
                .fork_point = -1,                       \
+               .reapply_cherry_picks = -1,             \
+               .allow_empty_message = 1,               \
        }
 
 static struct replay_opts get_replay_opts(const struct rebase_options *opts)
@@ -1158,8 +1160,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
        prepare_repo_settings(the_repository);
        the_repository->settings.command_requires_full_index = 0;
 
-       options.reapply_cherry_picks = -1;
-       options.allow_empty_message = 1;
        git_config(rebase_config, &options);
        /* options.gpg_sign_opt will be either "-S" or NULL */
        gpg_sign = options.gpg_sign_opt ? "" : NULL;