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>
Elijah Newren committed
Jan 25, 2023 at 04:03 UTC
3dc55b2087f1207911e6142c5082e4b06e6c9cbf
1 file changed
+2
-2
builtin/rebase.c
+2
-2
@@ -134,6 +134,8 @@ struct rebase_options {
134
.exec = STRING_LIST_INIT_NODUP, \
135
.git_format_patch_opt = STRBUF_INIT, \
136
.fork_point = -1, \
137
+ .reapply_cherry_picks = -1, \
138
+ .allow_empty_message = 1, \
139
}
140
141
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)
1160
prepare_repo_settings(the_repository);
1161
the_repository->settings.command_requires_full_index = 0;
1162
1161
- options.reapply_cherry_picks = -1;
1162
- options.allow_empty_message = 1;
1163
git_config(rebase_config, &options);
1164
/* options.gpg_sign_opt will be either "-S" or NULL */
1165
gpg_sign = options.gpg_sign_opt ? "" : NULL;