diff options
| author | Siddharth Asthana <siddharthasthana31@gmail.com> | 2025-11-06 00:45:59 +0530 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-11-05 13:34:55 -0800 |
| commit | e031fa100603af74def6bf2a646c731e4fcd12fc (patch) | |
| tree | 85b074316835ebe8c0039fd27d31efbefd1f392f /builtin/replay.c | |
| parent | bb69721404348ea2db0a081c41ab6ebfe75bdec8 (diff) | |
| download | git-e031fa100603af74def6bf2a646c731e4fcd12fc.tar.gz | |
replay: use die_for_incompatible_opt2() for option validation
In preparation for adding the --ref-action option, convert option
validation to use die_for_incompatible_opt2(). This helper provides
standardized error messages for mutually exclusive options.
The following commit introduces --ref-action which will be incompatible
with certain other options. Using die_for_incompatible_opt2() now means
that commit can cleanly add its validation using the same pattern,
keeping the validation logic consistent and maintainable.
This also aligns git-replay's option handling with how other Git commands
manage option conflicts, using the established die_for_incompatible_opt*()
helper family.
Signed-off-by: Siddharth Asthana <siddharthasthana31@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/replay.c')
| -rw-r--r-- | builtin/replay.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/replay.c b/builtin/replay.c index 6172c8aacc..b64fc72063 100644 --- a/builtin/replay.c +++ b/builtin/replay.c @@ -330,9 +330,9 @@ int cmd_replay(int argc, usage_with_options(replay_usage, replay_options); } - if (advance_name_opt && contained) - die(_("options '%s' and '%s' cannot be used together"), - "--advance", "--contained"); + die_for_incompatible_opt2(!!advance_name_opt, "--advance", + contained, "--contained"); + advance_name = xstrdup_or_null(advance_name_opt); repo_init_revisions(repo, &revs, prefix); |