From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Christian Couder <christian.couder@gmail.com>, git@vger.kernel.org
Subject: Re: [PATCH 0/9] trailer-parsing false positives
Date: Thu, 23 Aug 2018 11:30:54 -0700 [thread overview]
Message-ID: <xmqqefephr4x.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20180823004300.GA1355@sigill.intra.peff.net> (Jeff King's message of "Wed, 22 Aug 2018 20:43:01 -0400")
Jeff King <peff@peff.net> writes:
> So this turned into a bit of a rabbit hole. Here's what I have so far
> (which I think is not quite ready, but I wanted to start discussing).
>
> Issues (2) and (3) are actually the same issue. The caller that does the
> bogus appending for (2) is always append_signoff(). But it always has
> just a commit message (modulo some complications, which I'll get to in a
> minute), and so fixing it with respect to (3) magically solves (2).
> I.e., the code was simply not prepared for the case of "end of string is
> not end of trailers". But since that case cannot exist, we do not have
> to deal with it. :)
>
> Now here's the tricky part. I think patches 1-8 are mostly sensible.
Yeah, nothing that made me go "Huh?" in these 8 patches. Thanks.
> So I think there may be further opportunities for cleanup here. I'm not
> sure if we'd need to retain this behavior for git-interpret-trailers.
> AFAICT it is not documented, and I suspect is mostly historical
> accident, and not anything anybody ever wanted.
I tend to think the behaviour was not designed but it "just happens
to work that way".
> If we do keep it by default, then the "--no-divider" option I added in
> patch 4 should probably get a more generic name and cover this.
> Something like "--verbatim-input".
Perhaps. Even if this is not covered, --verbatim-input would be a
good name for the option ;-)
> I'm going to sleep on it and see how I feel tomorrow.
>
> [1/9]: trailer: use size_t for string offsets
> [2/9]: trailer: use size_t for iterating trailer list
> [3/9]: trailer: pass process_trailer_opts to trailer_info_get()
> [4/9]: interpret-trailers: tighten check for "---" patch boundary
> [5/9]: interpret-trailers: allow suppressing "---" divider
> [6/9]: pretty, ref-filter: format %(trailers) with no_divider option
> [7/9]: sequencer: ignore "---" divider when parsing trailers
> [8/9]: append_signoff: use size_t for string offsets
> [9/9]: sequencer: handle ignore_footer when parsing trailers
>
> Documentation/git-interpret-trailers.txt | 10 +++-
> builtin/interpret-trailers.c | 1 +
> commit.c | 6 +--
> commit.h | 2 +-
> pretty.c | 3 ++
> ref-filter.c | 2 +
> sequencer.c | 20 ++++++--
> sequencer.h | 9 +++-
> t/t4205-log-pretty-formats.sh | 23 +++++++++
> t/t6300-for-each-ref.sh | 23 +++++++++
> t/t7501-commit.sh | 16 ++++++
> t/t7513-interpret-trailers.sh | 42 ++++++++++++++++
> trailer.c | 62 +++++++++++++-----------
> trailer.h | 4 +-
> 14 files changed, 184 insertions(+), 39 deletions(-)
>
> -Peff
next prev parent reply other threads:[~2018-08-23 18:31 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-21 18:41 [PATCH] test-tool.h: include git-compat-util.h Jeff King
2018-08-21 19:03 ` Junio C Hamano
2018-08-21 19:06 ` [PATCH 1/6] t/perf: factor boilerplate out of test_perf Jeff King
2018-08-21 19:06 ` [PATCH 2/6] t/perf: factor out percent calculations Jeff King
2018-08-21 19:06 ` [PATCH 3/6] t/perf: add infrastructure for measuring sizes Jeff King
2018-08-22 13:40 ` Derrick Stolee
2018-08-22 15:31 ` Jeff King
2018-08-21 19:06 ` [PATCH 4/6] t/perf: add perf tests for fetches from a bitmapped server Jeff King
2018-08-21 19:07 ` [PATCH 5/6] pack-bitmap: save "have" bitmap from walk Jeff King
2018-08-21 19:47 ` Derrick Stolee
2018-08-21 19:54 ` Jeff King
2018-08-31 15:23 ` Ævar Arnfjörð Bjarmason
2018-08-31 22:55 ` Jeff King
2018-09-01 7:41 ` [PATCH 0/4] un-breaking pack-objects with bitmaps Jeff King
2018-09-01 7:44 ` [PATCH 1/4] bitmap_has_sha1_in_uninteresting(): drop BUG check Jeff King
2018-09-01 7:48 ` [PATCH 2/4] t5310: test delta reuse with bitmaps Jeff King
2018-09-01 8:03 ` Jeff King
2018-09-01 20:29 ` Ævar Arnfjörð Bjarmason
2018-09-01 22:46 ` Ben Peart
2018-09-02 5:51 ` Jeff King
2018-09-04 19:05 ` Stefan Beller
2018-09-04 19:45 ` Junio C Hamano
2018-09-04 20:02 ` Jeff King
2018-09-01 7:49 ` [PATCH 3/4] traverse_bitmap_commit_list(): don't free result Jeff King
2018-09-01 7:50 ` [PATCH 4/4] pack-bitmap: drop "loaded" flag Jeff King
2018-09-04 19:30 ` [PATCH 0/4] un-breaking pack-objects with bitmaps Stefan Beller
2018-09-04 20:03 ` Jeff King
2018-09-08 6:43 ` Ævar Arnfjörð Bjarmason
2018-09-10 16:53 ` Junio C Hamano
2018-09-10 18:48 ` Jeff King
2018-09-10 19:23 ` Junio C Hamano
2018-08-21 19:07 ` [PATCH 6/6] pack-objects: reuse on-disk deltas for thin "have" objects Jeff King
2018-08-21 19:43 ` Junio C Hamano
2018-08-21 19:50 ` Junio C Hamano
2018-08-21 20:07 ` Jeff King
2018-08-21 20:14 ` Jeff King
2018-08-21 20:52 ` Junio C Hamano
2018-08-21 21:30 ` Jeff King
2018-08-21 20:57 ` Junio C Hamano
2018-08-21 21:32 ` Jeff King
2018-08-23 0:43 ` [PATCH 0/9] trailer-parsing false positives Jeff King
2018-08-23 0:44 ` [PATCH 1/9] trailer: use size_t for string offsets Jeff King
2018-08-23 0:45 ` [PATCH 2/9] trailer: use size_t for iterating trailer list Jeff King
2018-08-23 0:46 ` [PATCH 3/9] trailer: pass process_trailer_opts to trailer_info_get() Jeff King
2018-08-23 0:48 ` [PATCH 4/9] interpret-trailers: tighten check for "---" patch boundary Jeff King
2018-08-23 0:49 ` [PATCH 5/9] interpret-trailers: allow suppressing "---" divider Jeff King
2018-08-23 0:50 ` [PATCH 6/9] pretty, ref-filter: format %(trailers) with no_divider option Jeff King
2018-08-23 0:50 ` [PATCH 7/9] sequencer: ignore "---" divider when parsing trailers Jeff King
2018-08-23 0:50 ` [PATCH 8/9] append_signoff: use size_t for string offsets Jeff King
2018-08-23 0:51 ` [PATCH 9/9] sequencer: handle ignore_footer when parsing trailers Jeff King
2018-08-23 18:30 ` Junio C Hamano [this message]
2018-08-24 7:26 ` [PATCH 0/9] trailer-parsing false positives Jeff King
2018-08-21 20:00 ` [PATCH 6/6] pack-objects: reuse on-disk deltas for thin "have" objects Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqefephr4x.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).