summaryrefslogtreecommitdiff
path: root/builtin/revert.c
diff options
context:
space:
mode:
authorPhillip Wood <phillip.wood@dunelm.org.uk>2017-08-02 10:44:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-08-02 22:16:09 (GMT)
commitf826fb799ed06f2f9537466f6988bcabd1200ebd (patch)
tree5421f270d921c087eebe4f5d5b55309c13dfc941 /builtin/revert.c
parent8d8cb4b047cef546ea80b8224c7b33707f6d6a4c (diff)
downloadgit-f826fb799ed06f2f9537466f6988bcabd1200ebd.zip
git-f826fb799ed06f2f9537466f6988bcabd1200ebd.tar.gz
git-f826fb799ed06f2f9537466f6988bcabd1200ebd.tar.bz2
cherry-pick/revert: reject --rerere-autoupdate when continuing
cherry-pick and revert should not accept --[no-]rerere-autoupdate once they have started. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/revert.c')
-rw-r--r--builtin/revert.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/revert.c b/builtin/revert.c
index 16028b9..b9d927e 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -155,6 +155,8 @@ static int run_sequencer(int argc, const char **argv, struct replay_opts *opts)
"--strategy-option", opts->xopts ? 1 : 0,
"-x", opts->record_origin,
"--ff", opts->allow_ff,
+ "--rerere-autoupdate", opts->allow_rerere_auto == RERERE_AUTOUPDATE,
+ "--no-rerere-autoupdate", opts->allow_rerere_auto == RERERE_NOAUTOUPDATE,
NULL);
}