From: Eric Wong <e@80x24.org>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: ds/sparse-cone, was Re: What's cooking in git.git (Oct 2019, #03; Fri, 11)
Date: Tue, 15 Oct 2019 01:50:52 +0000 [thread overview]
Message-ID: <20191015015052.GA19636@dcvr> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.1910122327250.3272@tvgsbejvaqbjf.bet>
Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> On Fri, 11 Oct 2019, Junio C Hamano wrote:
> > * ds/sparse-cone (2019-10-08) 17 commits
> > - sparse-checkout: cone mode should not interact with .gitignore
> > - sparse-checkout: write using lockfile
> > - sparse-checkout: update working directory in-process
> > - sparse-checkout: sanitize for nested folders
> > - read-tree: show progress by default
> > - unpack-trees: add progress to clear_ce_flags()
> > - unpack-trees: hash less in cone mode
> > - sparse-checkout: init and set in cone mode
> > - sparse-checkout: use hashmaps for cone patterns
> > - sparse-checkout: add 'cone' mode
> > - trace2: add region in clear_ce_flags
> > - sparse-checkout: create 'disable' subcommand
> > - sparse-checkout: add '--stdin' option to set subcommand
> > - sparse-checkout: 'set' subcommand
> > - clone: add --sparse mode
> > - sparse-checkout: create 'init' subcommand
> > - sparse-checkout: create builtin with 'list' subcommand
> >
> > Management of sparsely checked-out working tree has gained a
> > dedicated "sparse-checkout" command.
> >
> > Seems not to play well with the hashmap updates.
>
> Hrm. I had sent out links to the three fixups needed to make the build
> green:
>
> https://public-inbox.org/git/nycvar.QRO.7.76.6.1910081055210.46@tvgsbejvaqbjf.bet/
>
> In particular, the patches to squash were:
>
> https://github.com/git-for-windows/git/commit/f74259754971b427a14e6290681e18950824b99d
> https://github.com/git-for-windows/git/commit/124c8bc08e974e76ca7d956dc07eb288e71d639e
> https://github.com/git-for-windows/git/commit/45948433d1b48ff513fbd37f134c0f1491c78192
> diff --git a/dir.c b/dir.c
> index 0135f9e2180..9efcdc9aacd 100644
> --- a/dir.c
> +++ b/dir.c
<snip>
> @@ -706,8 +710,8 @@ static void add_pattern_to_hashsets(struct pattern_list *pl, struct path_pattern
>
> clear_hashmaps:
> warning(_("disabling cone pattern matching"));
> - hashmap_free(&pl->parent_hashmap, 1);
> - hashmap_free(&pl->recursive_hashmap, 1);
> + hashmap_free(&pl->parent_hashmap);
> + hashmap_free(&pl->recursive_hashmap);
I just took a brief look, but that appears to leak memory.
"hashmap_free(var, 1)" should be replaced with
"hashmap_free_entries(var, struct foo, member)"
Only "hashmap_free(var, 0)" can become "hashmap_free(var)"
next prev parent reply other threads:[~2019-10-15 1:50 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-11 7:35 What's cooking in git.git (Oct 2019, #03; Fri, 11) Junio C Hamano
2019-10-11 15:44 ` Elijah Newren
2019-10-11 16:42 ` Junio C Hamano
2019-10-11 20:39 ` Elijah Newren
2019-10-11 23:52 ` Junio C Hamano
2019-10-12 0:50 ` Junio C Hamano
2019-10-12 21:31 ` ds/sparse-cone, was " Johannes Schindelin
2019-10-15 1:50 ` Eric Wong [this message]
2019-10-15 3:20 ` Junio C Hamano
2019-10-15 7:11 ` Eric Wong
2019-10-15 12:54 ` Derrick Stolee
2019-10-16 1:21 ` 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=20191015015052.GA19636@dcvr \
--to=e@80x24.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).