[PATCH 2/5] sequencer: save/load all options
- From
Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
- Date
- Jan 23, 2017, 22:52 UTC
- Message-ID
- <20170123225221.3659-3-giuseppe.bilotta@gmail.com>
- In-Reply-To
- <20170123225221.3659-1-giuseppe.bilotta@gmail.com>
Add the missing replay_opts to save_opts and populate_opts, so that an interrupted cherry-pick will continue with the same setup it had before the interruption.
Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> --- sequencer.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
diff --git a/sequencer.c b/sequencer.c index 672c81b559..3d2f61c979 100644 --- a/sequencer.c +++ b/sequencer.c @@ -985,6 +985,14 @@ static int populate_opts_cb(const char *key, const char *value, void *data) opts->signoff = git_config_bool_or_int(key, value, &error_flag); else if (!strcmp(key, "options.allow-ff")) opts->allow_ff = git_config_bool_or_int(key, value, &error_flag); + else if (!strcmp(key, "options.rerere-autoupdate")) + opts->allow_rerere_auto = git_config_bool_or_int(key, value, &error_flag); + else if (!strcmp(key, "options.allow-empty")) + opts->allow_empty = git_config_bool_or_int(key, value, &error_flag); + else if (!strcmp(key, "options.allow-empty-message")) + opts->allow_empty_message = git_config_bool_or_int(key, value, &error_flag); + else if (!strcmp(key, "options.keep-redundant-commits")) + opts->keep_redundant_commits = git_config_bool_or_int(key, value, &error_flag); else if (!strcmp(key, "options.mainline")) opts->mainline = git_config_int(key, value); else if (!strcmp(key, "options.gpg-sign")) @@ -1233,6 +1241,14 @@ static int save_opts(struct replay_opts *opts) res |= git_config_set_in_file_gently(opts_file, "options.signoff", "true"); if (opts->allow_ff) res |= git_config_set_in_file_gently(opts_file, "options.allow-ff", "true"); + if (opts->allow_rerere_auto) + res |= git_config_set_in_file_gently(opts_file, "options.rerere-autoupdate", "true"); + if (opts->allow_empty) + res |= git_config_set_in_file_gently(opts_file, "options.allow-empty", "true"); + if (opts->allow_empty_message) + res |= git_config_set_in_file_gently(opts_file, "options.allow-empty-message", "true"); + if (opts->keep_redundant_commits) + res |= git_config_set_in_file_gently(opts_file, "options.keep-redundant-commits", "true"); if (opts->mainline) { struct strbuf buf = STRBUF_INIT; strbuf_addf(&buf, "%d", opts->mainline);
-- 2.11.0.616.gd72966cf44.dirty