diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-08-22 20:29:00 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-08-22 20:29:00 +0300 |
commit | 1016495a7190911b37c354f7a985278c51ae6666 (patch) | |
tree | 63d8897867229a377473b122902337658948add2 /builtin/am.c | |
parent | a49794d10826ef7cc9237abcf6474cd826de1063 (diff) | |
parent | f826fb799ed06f2f9537466f6988bcabd1200ebd (diff) |
Merge branch 'pw/sequence-rerere-autoupdate'
Commands like "git rebase" accepted the --rerere-autoupdate option
from the command line, but did not always use it. This has been
fixed.
* pw/sequence-rerere-autoupdate:
cherry-pick/revert: reject --rerere-autoupdate when continuing
cherry-pick/revert: remember --rerere-autoupdate
t3504: use test_commit
rebase -i: honor --rerere-autoupdate
rebase: honor --rerere-autoupdate
am: remember --rerere-autoupdate setting
Diffstat (limited to 'builtin/am.c')
-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 40cc6d6fe8..ff0869d46f 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"; |