From: Junio C Hamano <gitster@pobox.com>
To: "René Scharfe" <l.s.r@web.de>
Cc: "Git List" <git@vger.kernel.org>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Ramsay Jones" <ramsay@ramsayjones.plus.com>,
"Johannes Schindelin" <johannes.schindelin@gmx.de>
Subject: Re: [PATCH 2/2] fsck: use oidset for skiplist
Date: Mon, 13 Aug 2018 11:43:47 -0700 [thread overview]
Message-ID: <xmqqmutq5cpo.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <54a5367f-f832-402c-f51b-3225c92b41ad@web.de> ("René Scharfe"'s message of "Sat, 11 Aug 2018 17:47:56 +0200")
René Scharfe <l.s.r@web.de> writes:
> @@ -182,19 +181,10 @@ static int fsck_msg_type(enum fsck_msg_id msg_id,
> static void init_skiplist(struct fsck_options *options, const char
> *path)
> {
> - static struct oid_array skiplist = OID_ARRAY_INIT;
> - int sorted;
> FILE *fp;
> struct strbuf sb = STRBUF_INIT;
> struct object_id oid;
> - if (options->skiplist)
> - sorted = options->skiplist->sorted;
> - else {
That SP before '-' on the removed line is the most curious aspect of
this patch; I do not recall the last time I saw a corrupt patch from
you---changed where you read/write your mails recently?
> @@ -317,9 +300,7 @@ static void append_msg_id(struct strbuf *sb, const char *msg_id)
> static int object_on_skiplist(struct fsck_options *opts, struct
> object *obj)
> {
> - if (opts && opts->skiplist && obj)
> - return oid_array_lookup(opts->skiplist, &obj->oid) >= 0;
> - return 0;
> + return opts && obj && oidset_contains(&opts->skiplist, &obj->oid);
OK ;-)
next prev parent reply other threads:[~2018-08-13 18:43 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-11 15:39 [PATCH 1/2] fsck: use strbuf_getline() to read skiplist file René Scharfe
2018-08-11 15:47 ` [PATCH 2/2] fsck: use oidset for skiplist René Scharfe
2018-08-11 16:54 ` Ævar Arnfjörð Bjarmason
2018-08-25 18:49 ` René Scharfe
2018-08-11 17:02 ` Jeff King
2018-08-11 17:23 ` Jeff King
2018-08-11 20:59 ` René Scharfe
2018-08-13 17:15 ` René Scharfe
2018-08-14 1:58 ` Jeff King
2018-08-14 2:03 ` Jeff King
2018-08-26 11:37 ` René Scharfe
2018-08-27 23:03 ` Jeff King
2018-10-01 19:15 ` René Scharfe
2018-10-01 20:26 ` Jeff King
2018-10-02 19:05 ` René Scharfe
2018-10-02 19:19 ` Jeff King
2018-08-13 17:15 ` René Scharfe
2018-08-14 2:01 ` Jeff King
2018-08-11 20:48 ` Ramsay Jones
2018-08-25 18:49 ` René Scharfe
2018-08-13 18:43 ` Junio C Hamano [this message]
2018-08-13 20:26 ` René Scharfe
2018-08-13 21:07 ` Junio C Hamano
2018-08-13 23:09 ` René Scharfe
2018-08-11 16:48 ` [PATCH 1/2] fsck: use strbuf_getline() to read skiplist file Jeff King
2018-08-11 21:00 ` René Scharfe
2018-08-25 18:50 ` [PATCH v2 " René Scharfe
2018-08-27 23:00 ` Jeff King
2018-08-25 18:50 ` [PATCH v2 2/2] fsck: use oidset for skiplist René Scharfe
2018-08-27 7:37 ` Ævar Arnfjörð Bjarmason
2018-08-27 15:23 ` René Scharfe
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=xmqqmutq5cpo.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=l.s.r@web.de \
--cc=ramsay@ramsayjones.plus.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).