interpret-trailers: allow suppressing "---" divider

Even with the newly-tightened "---" parser, it's still
possible for a commit message to trigger a false positive if
it contains something like "--- foo". If the caller knows
that it has only a single commit message, it can now tell us
with the "--no-divider" option, eliminating any false
positives.

If we were designing this from scratch, I'd probably make
this the default. But we've advertised the "---" behavior in
the documentation since interpret-trailers has existed.
Since it's meant to be scripted, breaking that would be a
bad idea.

Note that the logic is in the underlying trailer.c code,
which is used elsewhere. The default there will keep the
current behavior, but many callers will benefit from setting
this new option. That's left for future patches.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King
2018-08-22 20:49:56 -04:00
committed by Junio C Hamano
parent c188668e38
commit 1688c9a489
5 changed files with 33 additions and 2 deletions

View File

@@ -69,6 +69,7 @@ struct process_trailer_options {
int only_trailers;
int only_input;
int unfold;
int no_divider;
};
#define PROCESS_TRAILER_OPTIONS_INIT {0}