Skip to content

Commit 3dc55b2

Browse files
newrengitster
authored andcommitted
rebase: put rebase_options initialization in single place
Signed-off-by: Elijah Newren <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 9a7d7ce commit 3dc55b2

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

builtin/rebase.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,8 @@ struct rebase_options {
134134
.exec = STRING_LIST_INIT_NODUP, \
135135
.git_format_patch_opt = STRBUF_INIT, \
136136
.fork_point = -1, \
137+
.reapply_cherry_picks = -1, \
138+
.allow_empty_message = 1, \
137139
}
138140

139141
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)
11581160
prepare_repo_settings(the_repository);
11591161
the_repository->settings.command_requires_full_index = 0;
11601162

1161-
options.reapply_cherry_picks = -1;
1162-
options.allow_empty_message = 1;
11631163
git_config(rebase_config, &options);
11641164
/* options.gpg_sign_opt will be either "-S" or NULL */
11651165
gpg_sign = options.gpg_sign_opt ? "" : NULL;

0 commit comments

Comments
 (0)