From: Barret Rhoden <brho@google.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: git@vger.kernel.org, Stefan Beller <stefanbeller@gmail.com>,
Jeff Smith <whydoubt@gmail.com>,
Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>
Subject: Re: [PATCH] blame: add the ability to ignore commits
Date: Tue, 8 Jan 2019 11:41:06 -0500 [thread overview]
Message-ID: <20190108114106.5cf57e67@gnomeregan.cam.corp.google.com> (raw)
In-Reply-To: <8736q3qon0.fsf@evledraar.gmail.com>
On 2019-01-08 at 14:12 Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:
> On Mon, Jan 07 2019, Barret Rhoden wrote:
>
> > +static int handle_ignore_file(const char *path, struct string_list *ignores)
> > +{
> > + FILE *fp = fopen(path, "r");
> > + struct strbuf sb = STRBUF_INIT;
> > +
> > + if (!fp)
> > + return -1;
> > + while (!strbuf_getline(&sb, fp)) {
> > + const char *hash;
> > +
> > + hash = strchr(sb.buf, '#');
> > + if (hash)
> > + strbuf_setlen(&sb, hash - sb.buf);
> > + strbuf_trim(&sb);
> > + if (!sb.len)
> > + continue;
> > + string_list_append(ignores, sb.buf);
> > + }
> > + fclose(fp);
> > + strbuf_release(&sb);
> > + return 0;
> > +}
>
> Aside from other comments on this patch that Junio had either you mostly
> copy-pasted this from init_skiplist() or you've come up with almost the
> same code on your own.
>
> In any case, if we're going to integrate something like this patch let's
> split this "parse file with SHA-1s or comments/whitespace" into a
> utility function that both this and init_skiplist() can call.
One minor difference is that fsck wants an unabbreviated SHA-1, using
parse_oid_hex() instead of get_oid_committish(). Would you be OK with
also changing fsck to take a committish instead of a full SHA-1?
Is there a good place for the common helper? Since it's an oidset, I
could put it in oidset.c. oidset_parse_file() or something.
> Then we could split up the description for the fsck.skipList config
> variable to reference that format, and say that both it and this new
> thing should consult those docs for how it's parsed.
Is there a good spot for the generic skipList documentation? The only
common text would be:
... comments ('#'), empty lines, and any leading and trailing
whitespace is ignored
Thanks,
Barret
next prev parent reply other threads:[~2019-01-08 16:41 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-07 21:30 [PATCH] blame: add the ability to ignore commits Barret Rhoden
2019-01-07 23:13 ` Junio C Hamano
2019-01-08 16:27 ` Barret Rhoden
2019-01-08 18:26 ` Junio C Hamano
2019-01-09 20:48 ` Barret Rhoden
2019-01-10 22:29 ` Junio C Hamano
2019-01-14 15:19 ` Barret Rhoden
2019-01-14 17:45 ` Junio C Hamano
2019-01-14 18:26 ` Randall S. Becker
2019-01-14 19:03 ` Barret Rhoden
2019-01-15 6:08 ` Junio C Hamano
2019-01-09 21:21 ` Stefan Beller
2019-01-08 13:12 ` Ævar Arnfjörð Bjarmason
2019-01-08 16:41 ` Barret Rhoden [this message]
2019-01-08 18:04 ` Barret Rhoden
2019-01-17 20:29 ` [PATCH v2 0/3] " Barret Rhoden
2019-01-17 20:29 ` [PATCH v2 1/3] Move init_skiplist() outside of fsck Barret Rhoden
2019-01-18 9:25 ` Johannes Schindelin
2019-01-18 9:45 ` Ævar Arnfjörð Bjarmason
2019-01-18 17:36 ` Junio C Hamano
2019-01-18 20:59 ` Johannes Schindelin
2019-01-18 21:30 ` Jeff King
2019-01-18 22:26 ` Ævar Arnfjörð Bjarmason
2019-01-22 7:12 ` Jeff King
2019-01-22 9:46 ` Ævar Arnfjörð Bjarmason
2019-01-22 17:54 ` Junio C Hamano
2019-01-22 18:28 ` Jeff King
2019-01-17 20:29 ` [PATCH v2 2/3] blame: add the ability to ignore commits and their changes Barret Rhoden
2019-01-18 9:47 ` Johannes Schindelin
2019-01-18 17:33 ` Barret Rhoden
2019-01-20 18:19 ` René Scharfe
2019-01-22 15:26 ` Barret Rhoden
2019-01-22 18:14 ` Junio C Hamano
2019-01-22 19:35 ` Barret Rhoden
2019-01-23 19:26 ` Junio C Hamano
2019-02-01 20:37 ` Barret Rhoden
2019-01-17 20:29 ` [PATCH v2 3/3] blame: add a config option to mark ignored lines Barret Rhoden
2019-01-18 10:03 ` Johannes Schindelin
2019-01-18 9:52 ` [PATCH v2 0/3] blame: add the ability to ignore commits Ævar Arnfjörð Bjarmason
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=20190108114106.5cf57e67@gnomeregan.cam.corp.google.com \
--to=brho@google.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=stefanbeller@gmail.com \
--cc=whydoubt@gmail.com \
/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).