Re: [PATCH 2/3] [GSOC] ref-filter: support %(contents) for blob, tree
- From
Junio C Hamano <gitster@pobox.com>
- Date
- May 25, 2021, 05:03 UTC
- Message-ID
- <xmqqfsybh0bn.fsf@gitster.g>
- In-Reply-To
- <19413cfdb1ea50de401ab958b954a550b6514688.1621763612.git.gitgitgadget@gmail.com>
"ZheNing Hu via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 5 quoted lines
> @@ -1292,7 +1326,8 @@ static void append_lines(struct strbuf *out, const char *buf, unsigned long size > } > > /* See grab_values */ > -static void grab_sub_body_contents(struct atom_value *val, int deref, void *buf)
As I already said, I do not think %(contents) mixes well with this use for trees and blobs where you give the raw bytes, since %(contents) for commit and tag objects was never about the full byte sequence of the object. It was to give the unstructured part meant for human consumption, stripping the structured "header" part of the object.
Nevertheless, since queuing this topic breaks the build and gets in the way to find issues in other proposed regression fixes of higher importance,...
Show 12 quoted lines
> +static void grab_contents(struct atom_value *val, int deref, void *buf,
> + unsigned long buf_size, enum object_type object_type)
> {
> ...
> + switch (object_type) {
> + case OBJ_TAG:
> + case OBJ_COMMIT: {
> ...
> + v->s = xmemdupz(bodypos, bodylen);
> + else if (atom->u.contents.option == C_LENGTH)
> + v->s = xstrfmt("%"PRIuMAX, (uintmax_t)strlen(subpos));
> ...Note that this part inherits from the original and knows how to feed a value to PRIuMAX with correct cast ...
Show 11 quoted lines
> + v->s = xmemdupz(bodypos, nonsiglen);
> + else if (atom->u.contents.option == C_SIG)
> ...
> + }
> + case OBJ_BLOB:
> + case OBJ_TREE: {
> + if (atom->u.contents.option == C_BARE) {
> + v->s_size = buf_size;
> + v->s = xmemdupz(buf, buf_size);
> + } else if (atom->u.contents.option == C_LENGTH)
> + v->s = xstrfmt("%"PRIuMAX, buf_size);... but this one gets sloppy, and breaks the windows-build of 'seen'. Fix is simple:
+ v->s = xstrfmt("%"PRIuMAX, (uintmax_t)buf_size);I'll squash it in before rebuilding 'seen'.