Hello Eric,
On 2024-04-17 09:05, Dragan Simic wrote:
On 2024-04-17 08:35, Eric Sunshine wrote:
On Tue, Apr 16, 2024 at 11:33 PM Dragan Simic <dsimic@xxxxxxxxxxx>
wrote:
diff --git a/builtin/log.c b/builtin/log.c
@@ -2111,7 +2116,9 @@ int cmd_format_patch(int argc, const char
**argv, const char *prefix)
if (keep_subject && subject_prefix)
- die(_("options '%s' and '%s' cannot be used
together"), "--subject-prefix/--rfc", "-k");
+ die(_("options '%s' and '%s' cannot be used
together"), "--subject-prefix/--rfc/--resend", "-k");
You probably want to be using die_for_incompatible_opt4() from
parse-options.h here.
Thanks for the suggestion. Frankly, I haven't researched the
available options, assuming that the current code uses the right
option. Of course, I'll have a detailed look into it.
Unfortunately, die_for_incompatible_opt3() cannot be used because
it also prevents the --subject-prefix and --rfc options from being
used together, which is expected to be possible.
(And you may want a preparatory patch which fixes the preimage to use
die_for_incompatible_opt3() for --subject-prefix, --rfc, and -k
exclusivity, though that may be overkill.)
I'm not really sure what to do. Maybe the other reviewers would
prefer an orthogonal approach instead? Maybe that would be better
for bisecting later, if need arises for that?
