diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2017-08-02 11:44:15 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-02 15:16:09 -0700 |
| commit | fd4a3f486d97682a0f42dfc84fe7af742bd76230 (patch) | |
| tree | 3fc420bf052dfdeaf88e3563e12d9deb8eb356b8 | |
| parent | 384a8b271c076693d00c97184b5c41ab3a95e64d (diff) | |
| download | git-fd4a3f486d97682a0f42dfc84fe7af742bd76230.tar.gz git-fd4a3f486d97682a0f42dfc84fe7af742bd76230.tar.xz | |
am: remember --rerere-autoupdate setting
Save the rerere-autoupdate setting so that it is remembered after
stopping for the user to resolve conflicts.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/am.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/builtin/am.c b/builtin/am.c index c973bd96d..6962d4db5 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -431,6 +431,14 @@ static void am_load(struct am_state *state) read_state_file(&sb, state, "utf8", 1); state->utf8 = !strcmp(sb.buf, "t"); + if (file_exists(am_path(state, "rerere-autoupdate"))) { + read_state_file(&sb, state, "rerere-autoupdate", 1); + state->allow_rerere_autoupdate = strcmp(sb.buf, "t") ? + RERERE_NOAUTOUPDATE : RERERE_AUTOUPDATE; + } else { + state->allow_rerere_autoupdate = 0; + } + read_state_file(&sb, state, "keep", 1); if (!strcmp(sb.buf, "t")) state->keep = KEEP_TRUE; @@ -1003,6 +1011,10 @@ static void am_setup(struct am_state *state, enum patch_format patch_format, write_state_bool(state, "sign", state->signoff); write_state_bool(state, "utf8", state->utf8); + if (state->allow_rerere_autoupdate) + write_state_bool(state, "rerere-autoupdate", + state->allow_rerere_autoupdate == RERERE_AUTOUPDATE); + switch (state->keep) { case KEEP_FALSE: str = "f"; |