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>
Siddharth Asthana committed
Nov 6, 2025 at 00:45 UTC
e031fa100603af74def6bf2a646c731e4fcd12fc
1 file changed
+3
-3
builtin/replay.c
+3
-3
@@ -330,9 +330,9 @@ int cmd_replay(int argc,
330
usage_with_options(replay_usage, replay_options);
331
}
332
333
- if (advance_name_opt && contained)
334
- die(_("options '%s' and '%s' cannot be used together"),
335
- "--advance", "--contained");
333
+ die_for_incompatible_opt2(!!advance_name_opt, "--advance",
334
+ contained, "--contained");
335
+
336
advance_name = xstrdup_or_null(advance_name_opt);
337
338
repo_init_revisions(repo, &revs, prefix);