From: Eric Sunshine <sunshine@sunshineco.com>
To: Jeff Hostetler <git@jeffhostetler.com>
Cc: Git List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
jonathantanmy@google.com, Jeff Hostetler <jeffhost@microsoft.com>
Subject: Re: [PATCH 01/13] dir: allow exclusions from blob in addition to file
Date: Wed, 25 Oct 2017 00:05:20 -0400 [thread overview]
Message-ID: <CAPig+cSPwSq1s5EhnQA+K-zQJ_+LrTLJFA9n8fj+W9jtdpA+PQ@mail.gmail.com> (raw)
In-Reply-To: <20171024185332.57261-2-git@jeffhostetler.com>
On Tue, Oct 24, 2017 at 2:53 PM, Jeff Hostetler <git@jeffhostetler.com> wrote:
> Refactor add_excludes() to separate the reading of the
> exclude file into a buffer and the parsing of the buffer
> into exclude_list items.
>
> Add add_excludes_from_blob_to_list() to allow an exclude
> file be specified with an OID.
>
> Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
> ---
> diff --git a/dir.c b/dir.c
> @@ -841,6 +856,38 @@ int add_excludes_from_file_to_list(const char *fname, const char *base,
> +int add_excludes_from_blob_to_list(
> + struct object_id *oid,
> + const char *base, int baselen,
> + struct exclude_list *el)
> +{
> + char *buf;
> + unsigned long size;
> + enum object_type type;
> +
> + buf = read_sha1_file(oid->hash, &type, &size);
> + if (!buf)
> + return -1;
> +
> + if (type != OBJ_BLOB) {
> + free(buf);
> + return -1;
> + }
> +
> + if (size == 0) {
> + free(buf);
> + return 0;
> + }
> +
> + if (buf[size - 1] != '\n') {
> + buf = xrealloc(buf, st_add(size, 1));
> + buf[size++] = '\n';
> + }
> +
> + add_excludes_from_buffer(buf, size, base, baselen, el);
Seeing all the free()'s above, at first glance, one wonders why 'buf'
isn't freed here after add_excludes_from_buffer(), however an
examination of that function shows that 'buf' is assigned to
el->filebuf and later freed by clear_exclude_list(). Okay.
> + return 0;
Should this be returning the result of add_excludes_from_buffer()
rather than unconditionally returning 0?
> +}
next prev parent reply other threads:[~2017-10-25 4:05 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-24 18:53 [PATCH 00/13] WIP Partial clone part 1: object filtering Jeff Hostetler
2017-10-24 18:53 ` [PATCH 01/13] dir: allow exclusions from blob in addition to file Jeff Hostetler
2017-10-25 4:05 ` Eric Sunshine [this message]
2017-10-25 6:43 ` Junio C Hamano
2017-10-25 14:54 ` Jeff Hostetler
2017-10-26 3:47 ` Junio C Hamano
2017-10-26 18:11 ` Jeff Hostetler
2017-10-24 18:53 ` [PATCH 02/13] list-objects-filter-map: extend oidmap to collect omitted objects Jeff Hostetler
2017-10-25 7:10 ` Junio C Hamano
2017-10-25 19:22 ` Jeff Hostetler
2017-10-26 4:12 ` Junio C Hamano
2017-10-24 18:53 ` [PATCH 03/13] list-objects: filter objects in traverse_commit_list Jeff Hostetler
2017-10-25 4:05 ` Jonathan Tan
2017-10-25 19:25 ` Jeff Hostetler
2017-10-24 18:53 ` [PATCH 04/13] list-objects-filter-blobs-none: add filter to omit all blobs Jeff Hostetler
2017-10-24 18:53 ` [PATCH 05/13] list-objects-filter-blobs-limit: add large blob filtering Jeff Hostetler
2017-10-24 18:53 ` [PATCH 06/13] list-objects-filter-sparse: add sparse filter Jeff Hostetler
2017-10-24 18:53 ` [PATCH 07/13] list-objects-filter-options: common argument parsing Jeff Hostetler
2017-10-25 4:14 ` Jonathan Tan
2017-10-25 19:28 ` Jeff Hostetler
2017-10-24 18:53 ` [PATCH 08/13] list-objects: add traverse_commit_list_filtered method Jeff Hostetler
2017-10-25 4:24 ` Jonathan Tan
2017-10-25 19:29 ` Jeff Hostetler
2017-10-24 18:53 ` [PATCH 09/13] extension.partialclone: introduce partial clone extension Jeff Hostetler
2017-10-24 18:53 ` [PATCH 10/13] rev-list: add list-objects filtering support Jeff Hostetler
2017-10-25 4:41 ` Jonathan Tan
2017-10-25 19:37 ` Jeff Hostetler
2017-10-24 18:53 ` [PATCH 11/13] t6112: rev-list object filtering test Jeff Hostetler
2017-10-24 18:53 ` [PATCH 12/13] pack-objects: add list-objects filtering Jeff Hostetler
2017-10-24 18:53 ` [PATCH 13/13] t5317: pack-objects object filtering test Jeff Hostetler
2017-10-25 4:57 ` [PATCH 00/13] WIP Partial clone part 1: object filtering Jonathan Tan
2017-10-25 5:00 ` Junio C Hamano
2017-10-25 6:46 ` Jonathan Tan
2017-10-25 15:39 ` Jeff Hostetler
2017-10-26 2:09 ` Junio C Hamano
2017-10-26 2:01 ` Junio C Hamano
2017-10-30 22:27 ` Jonathan Nieder
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=CAPig+cSPwSq1s5EhnQA+K-zQJ_+LrTLJFA9n8fj+W9jtdpA+PQ@mail.gmail.com \
--to=sunshine@sunshineco.com \
--cc=git@jeffhostetler.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jeffhost@microsoft.com \
--cc=jonathantanmy@google.com \
--cc=peff@peff.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).