From: Michael Haggerty <mhagger@alum.mit.edu>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Stefan Beller" <sbeller@google.com>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Jeff King" <peff@peff.net>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Brandon Williams" <bmwill@google.com>,
git@vger.kernel.org, "Michael Haggerty" <mhagger@alum.mit.edu>
Subject: [PATCH v3 06/21] read_packed_refs(): only check for a header at the top of the file
Date: Mon, 25 Sep 2017 10:00:03 +0200 [thread overview]
Message-ID: <c8e8df259b99e26a49a7bc03c4dc657c2b36d61d.1506325610.git.mhagger@alum.mit.edu> (raw)
In-Reply-To: <cover.1506325610.git.mhagger@alum.mit.edu>
This tightens up the parsing a bit; previously, stray header-looking
lines would have been processed.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
refs/packed-backend.c | 35 ++++++++++++++++++++++++-----------
1 file changed, 24 insertions(+), 11 deletions(-)
diff --git a/refs/packed-backend.c b/refs/packed-backend.c
index 154abbd83a..141f02b9c8 100644
--- a/refs/packed-backend.c
+++ b/refs/packed-backend.c
@@ -255,11 +255,34 @@ static struct packed_ref_cache *read_packed_refs(struct packed_ref_store *refs)
pos = buf;
eof = buf + size;
+ /* If the file has a header line, process it: */
+ if (pos < eof && *pos == '#') {
+ const char *traits;
+
+ eol = memchr(pos, '\n', eof - pos);
+ if (!eol)
+ die_unterminated_line(refs->path, pos, eof - pos);
+
+ strbuf_add(&line, pos, eol + 1 - pos);
+
+ if (!skip_prefix(line.buf, "# pack-refs with:", &traits))
+ die_invalid_line(refs->path, pos, eof - pos);
+
+ if (strstr(traits, " fully-peeled "))
+ peeled = PEELED_FULLY;
+ else if (strstr(traits, " peeled "))
+ peeled = PEELED_TAGS;
+ /* perhaps other traits later as well */
+
+ /* The "+ 1" is for the LF character. */
+ pos = eol + 1;
+ strbuf_reset(&line);
+ }
+
dir = get_ref_dir(packed_refs->cache->root);
while (pos < eof) {
struct object_id oid;
const char *refname;
- const char *traits;
eol = memchr(pos, '\n', eof - pos);
if (!eol)
@@ -267,15 +290,6 @@ static struct packed_ref_cache *read_packed_refs(struct packed_ref_store *refs)
strbuf_add(&line, pos, eol + 1 - pos);
- if (skip_prefix(line.buf, "# pack-refs with:", &traits)) {
- if (strstr(traits, " fully-peeled "))
- peeled = PEELED_FULLY;
- else if (strstr(traits, " peeled "))
- peeled = PEELED_TAGS;
- /* perhaps other traits later as well */
- goto next_line;
- }
-
refname = parse_ref_line(&line, &oid);
if (refname) {
int flag = REF_ISPACKED;
@@ -307,7 +321,6 @@ static struct packed_ref_cache *read_packed_refs(struct packed_ref_store *refs)
die_invalid_line(refs->path, line.buf, line.len);
}
- next_line:
/* The "+ 1" is for the LF character. */
pos = eol + 1;
strbuf_reset(&line);
--
2.14.1
next prev parent reply other threads:[~2017-09-25 8:00 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-25 7:59 [PATCH v3 00/21] Read `packed-refs` using mmap() Michael Haggerty
2017-09-25 7:59 ` [PATCH v3 01/21] ref_iterator: keep track of whether the iterator output is ordered Michael Haggerty
2017-09-25 7:59 ` [PATCH v3 02/21] prefix_ref_iterator: break when we leave the prefix Michael Haggerty
2017-09-25 8:00 ` [PATCH v3 03/21] packed_ref_cache: add a backlink to the associated `packed_ref_store` Michael Haggerty
2017-09-25 8:00 ` [PATCH v3 04/21] die_unterminated_line(), die_invalid_line(): new functions Michael Haggerty
2017-09-25 8:00 ` [PATCH v3 05/21] read_packed_refs(): use mmap to read the `packed-refs` file Michael Haggerty
2017-09-25 8:00 ` Michael Haggerty [this message]
2017-09-25 8:00 ` [PATCH v3 07/21] read_packed_refs(): make parsing of the header line more robust Michael Haggerty
2017-09-25 8:00 ` [PATCH v3 08/21] read_packed_refs(): read references with minimal copying Michael Haggerty
2017-09-25 8:00 ` [PATCH v3 09/21] packed_ref_cache: remember the file-wide peeling state Michael Haggerty
2017-09-25 8:00 ` [PATCH v3 10/21] mmapped_ref_iterator: add iterator over a packed-refs file Michael Haggerty
2017-09-25 8:00 ` [PATCH v3 11/21] mmapped_ref_iterator_advance(): no peeled value for broken refs Michael Haggerty
2017-09-25 8:00 ` [PATCH v3 12/21] packed-backend.c: reorder some definitions Michael Haggerty
2017-09-25 8:00 ` [PATCH v3 13/21] packed_ref_cache: keep the `packed-refs` file mmapped if possible Michael Haggerty
2017-09-25 8:00 ` [PATCH v3 14/21] read_packed_refs(): ensure that references are ordered when read Michael Haggerty
2017-09-25 8:00 ` [PATCH v3 15/21] packed_ref_iterator_begin(): iterate using `mmapped_ref_iterator` Michael Haggerty
2017-09-25 8:00 ` [PATCH v3 16/21] packed_read_raw_ref(): read the reference from the mmapped buffer Michael Haggerty
2017-09-25 8:00 ` [PATCH v3 17/21] ref_store: implement `refs_peel_ref()` generically Michael Haggerty
2017-09-25 8:00 ` [PATCH v3 18/21] packed_ref_store: get rid of the `ref_cache` entirely Michael Haggerty
2017-09-25 8:00 ` [PATCH v3 19/21] ref_cache: remove support for storing peeled values Michael Haggerty
2017-09-25 8:00 ` [PATCH v3 20/21] mmapped_ref_iterator: inline into `packed_ref_iterator` Michael Haggerty
2017-09-25 8:00 ` [PATCH v3 21/21] packed-backend.c: rename a bunch of things and update comments Michael Haggerty
2017-09-25 12:22 ` [PATCH v3 00/21] Read `packed-refs` using mmap() Jeff King
2017-09-29 2:13 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c8e8df259b99e26a49a7bc03c4dc657c2b36d61d.1506325610.git.mhagger@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=Johannes.Schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=sbeller@google.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).