mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
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>
This commit is contained in:
parent
9a7d7ce9f6
commit
3dc55b2087
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue