[PATCH v6 12/28] cherry-pick: remember rerere-autoupdate
From: Felipe Contreras <hidden>
Date: 2016-06-15 22:58:34
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Felipe Contreras <redacted> --- sequencer.c | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/sequencer.c b/sequencer.c
index 076bb9d..453e4a4 100644
--- a/sequencer.c
+++ b/sequencer.c@@ -847,6 +847,8 @@ static int populate_opts_cb(const char *key, const char *value, void *data) opts->xopts[opts->xopts_nr++] = xstrdup(value); } else if (!strcmp(key, "options.action-name")) git_config_string(&opts->action_name, key, value); + else if (!strcmp(key, "options.allow-rerere-auto")) + opts->allow_rerere_auto = git_config_int(key, value); else return error(_("Invalid key: %s"), key);
@@ -1026,6 +1028,12 @@ static void save_opts(struct replay_opts *opts) } if (opts->action_name) git_config_set_in_file(opts_file, "options.action-name", opts->action_name); + if (opts->allow_rerere_auto) { + struct strbuf buf = STRBUF_INIT; + strbuf_addf(&buf, "%d", opts->allow_rerere_auto); + git_config_set_in_file(opts_file, "options.allow-rerere-auto", buf.buf); + strbuf_release(&buf); + } } static int pick_commits(struct commit_list *todo_list, struct replay_opts *opts)
--
1.8.4-fc