[PATCH v3 1/3] replay: use die_for_incompatible_opt2() for option validation
- From
Siddharth Asthana <siddharthasthana31@gmail.com>
- Date
- Oct 13, 2025, 18:33 UTC
- Message-ID
- <20251013183311.33329-2-siddharthasthana31@gmail.com>
- In-Reply-To
- <20251013183311.33329-1-siddharthasthana31@gmail.com>
In preparation for adding the --update-refs option, convert option validation to use die_for_incompatible_opt2(). This helper provides standardized error messages for mutually exclusive options.
The following commit introduces --update-refs 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> --- builtin/replay.c | 6 +++--- 1 file 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);
-- 2.51.0