[PATCH v5 22/36] cherry-pick: remember rerere-autoupdate

[Felipe Contreras]

Signed-off-by: Felipe Contreras <felipe.contre...@gmail.com>
---
 builtin/sequencer.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/builtin/sequencer.c b/builtin/sequencer.c
index 3fec505..f805883 100644
--- a/builtin/sequencer.c
+++ b/builtin/sequencer.c
@@ -753,6 +753,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);
 
@@ -932,6 +934,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.3.698.g079b096

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html