summaryrefslogtreecommitdiff
path: root/trailer.h
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2018-08-23 00:49:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-08-23 17:08:51 (GMT)
commit1688c9a4894df517241026c7a3848bdc84607986 (patch)
treecaef7f87bffe250f260ec28a34bc7db0da87e078 /trailer.h
parentc188668e387509565237a865a1c63e890f6bbcd7 (diff)
downloadgit-1688c9a4894df517241026c7a3848bdc84607986.zip
git-1688c9a4894df517241026c7a3848bdc84607986.tar.gz
git-1688c9a4894df517241026c7a3848bdc84607986.tar.bz2
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>
Diffstat (limited to 'trailer.h')
-rw-r--r--trailer.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/trailer.h b/trailer.h
index 82a62b3..f47b16e 100644
--- a/trailer.h
+++ b/trailer.h
@@ -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}