From: Jeff King <peff@peff.net>
To: "brian m. carlson" <sandals@crustytoothpaste.net>
Cc: git@vger.kernel.org, "Martin Ågren" <martin.agren@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>
Subject: Re: [PATCH 4/5] tree-walk: store object_id in a separate member
Date: Thu, 10 Jan 2019 01:49:45 -0500 [thread overview]
Message-ID: <20190110064944.GA6810@sigill.intra.peff.net> (raw)
In-Reply-To: <20190110042551.915769-5-sandals@crustytoothpaste.net>
On Thu, Jan 10, 2019 at 04:25:50AM +0000, brian m. carlson wrote:
> diff --git a/tree-walk.c b/tree-walk.c
> index 1e040fc20e..b6daeab16d 100644
> --- a/tree-walk.c
> +++ b/tree-walk.c
> @@ -48,7 +48,8 @@ static int decode_tree_entry(struct tree_desc *desc, const char *buf, unsigned l
> /* Initialize the descriptor entry */
> desc->entry.path = path;
> desc->entry.mode = canon_mode(mode);
> - desc->entry.oid = (const struct object_id *)(path + len);
> + desc->entry.pathlen = len - 1;
> + memcpy(desc->entry.oid.hash, path + len, the_hash_algo->rawsz);
>
> return 0;
> }
This one really is a hashcpy() now, right, even after your final patch?
I guess using rawsz explicitly makes it match the computation here:
> @@ -107,7 +108,7 @@ static void entry_extract(struct tree_desc *t, struct name_entry *a)
> static int update_tree_entry_internal(struct tree_desc *desc, struct strbuf *err)
> {
> const void *buf = desc->buffer;
> - const unsigned char *end = desc->entry.oid->hash + the_hash_algo->rawsz;
> + const unsigned char *end = (const unsigned char *)desc->entry.path + desc->entry.pathlen + 1 + the_hash_algo->rawsz;
> unsigned long size = desc->size;
> unsigned long len = end - (const unsigned char *)buf;
So maybe it's better to be explicit as you have here. (Mostly just as I
was reading it, I was looking for a use of hashcpy and was surprised not
to find it ;) ).
> @@ -175,9 +176,11 @@ void setup_traverse_info(struct traverse_info *info, const char *base)
> pathlen--;
> info->pathlen = pathlen ? pathlen + 1 : 0;
> info->name.path = base;
> - info->name.oid = (void *)(base + pathlen + 1);
> - if (pathlen)
> + info->name.pathlen = pathlen;
> + if (pathlen) {
> + memcpy(info->name.oid.hash, (base + pathlen + 1), the_hash_algo->rawsz);
> info->prev = &dummy;
> + }
> }
>
Ditto here, I think.
-Peff
next prev parent reply other threads:[~2019-01-10 6:49 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-07 23:34 What's cooking in git.git (Jan 2019, #01; Mon, 7) Junio C Hamano
2019-01-08 9:50 ` tg/checkout-no-overlay, was " Thomas Gummerer
2019-01-08 17:51 ` Junio C Hamano
2019-01-08 17:30 ` ag/sequencer-reduce-rewriting-todo " Alban Gruin
2019-01-08 21:20 ` sb/more-repo-in-api, was " Jonathan Tan
2019-01-08 21:35 ` Junio C Hamano
2019-01-09 21:28 ` Stefan Beller
2019-01-09 7:37 ` Martin Ågren
2019-01-09 21:06 ` Martin Ågren
2019-01-10 1:02 ` brian m. carlson
2019-01-10 18:55 ` Junio C Hamano
2019-01-10 19:03 ` Martin Ågren
2019-01-10 4:25 ` [PATCH 0/5] tree-walk object_id refactor brian m. carlson
2019-01-10 4:25 ` [PATCH 1/5] tree-walk: copy object ID before use brian m. carlson
2019-01-10 4:25 ` [PATCH 2/5] match-trees: compute buffer offset correctly when splicing brian m. carlson
2019-01-10 4:25 ` [PATCH 3/5] match-trees: use hashcpy to splice trees brian m. carlson
2019-01-10 6:45 ` Jeff King
2019-01-10 23:55 ` brian m. carlson
2019-01-11 14:51 ` Jeff King
2019-01-11 14:54 ` Jeff King
2019-01-14 1:30 ` brian m. carlson
2019-01-14 15:40 ` Jeff King
2019-01-10 4:25 ` [PATCH 4/5] tree-walk: store object_id in a separate member brian m. carlson
2019-01-10 6:49 ` Jeff King [this message]
2019-01-10 23:57 ` brian m. carlson
2019-01-10 4:25 ` [PATCH 5/5] cache: make oidcpy always copy GIT_MAX_RAWSZ bytes brian m. carlson
2019-01-10 6:50 ` Jeff King
2019-01-10 6:40 ` [PATCH 0/5] tree-walk object_id refactor Jeff King
2019-01-11 0:17 ` brian m. carlson
2019-01-11 14:17 ` Jeff King
2019-01-15 0:39 ` [PATCH v2 " brian m. carlson
2019-01-15 0:39 ` [PATCH v2 1/5] tree-walk: copy object ID before use brian m. carlson
2019-01-15 0:39 ` [PATCH v2 2/5] match-trees: compute buffer offset correctly when splicing brian m. carlson
2019-01-15 0:39 ` [PATCH v2 3/5] match-trees: use hashcpy to splice trees brian m. carlson
2019-01-15 0:39 ` [PATCH v2 4/5] tree-walk: store object_id in a separate member brian m. carlson
2019-01-15 0:39 ` [PATCH v2 5/5] cache: make oidcpy always copy GIT_MAX_RAWSZ bytes brian m. carlson
2019-01-15 17:51 ` [PATCH v2 0/5] tree-walk object_id refactor Junio C Hamano
2019-01-09 10:28 ` What's cooking in git.git (Jan 2019, #01; Mon, 7) Jeff King
2019-01-10 19:05 ` Junio C Hamano
2019-01-10 19:46 ` Junio C Hamano
2019-01-10 18:02 ` Stefan Beller
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=20190110064944.GA6810@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=martin.agren@gmail.com \
--cc=sandals@crustytoothpaste.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.
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).