diff options
| author | Brian Lyles <brianmlyles@gmail.com> | 2024-03-25 18:16:53 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-03-25 16:45:41 -0700 |
| commit | bd2f9fd025e3aa2926f249e9c24f1f648e89d997 (patch) | |
| tree | dd8c9b7ff9bb5d30c8a36d2e5dc97d04084d7e27 /builtin | |
| parent | 661b671aec3683718fe58f78f85359a11f57a57a (diff) | |
| download | git-bd2f9fd025e3aa2926f249e9c24f1f648e89d997.tar.gz | |
cherry-pick: enforce `--keep-redundant-commits` incompatibility
When `--keep-redundant-commits` was added in b27cfb0d8d
(git-cherry-pick: Add keep-redundant-commits option, 2012-04-20), it was
not marked as incompatible with the various operations needed to
continue or exit a cherry-pick (`--continue`, `--skip`, `--abort`, and
`--quit`).
Enforce this incompatibility via `verify_opt_compatible` like we do for
the other various options.
Signed-off-by: Brian Lyles <brianmlyles@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/revert.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/revert.c b/builtin/revert.c index 89821bab95..a1936ef70e 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -167,6 +167,7 @@ static int run_sequencer(int argc, const char **argv, const char *prefix, "--ff", opts->allow_ff, "--rerere-autoupdate", opts->allow_rerere_auto == RERERE_AUTOUPDATE, "--no-rerere-autoupdate", opts->allow_rerere_auto == RERERE_NOAUTOUPDATE, + "--keep-redundant-commits", opts->keep_redundant_commits, NULL); } |