From: Derrick Stolee <stolee@gmail.com>
To: Jeff King <peff@peff.net>
Cc: Constantine <hi-angel@yandex.ru>,
Junio C Hamano <gitster@pobox.com>,
Christian Couder <christian.couder@gmail.com>,
Mike Hommey <mh@glandium.org>, git <git@vger.kernel.org>
Subject: Re: git-clone causes out of memory
Date: Fri, 13 Oct 2017 09:55:15 -0400 [thread overview]
Message-ID: <53f98311-3c5f-9863-5f6c-bc4f25fad317@gmail.com> (raw)
In-Reply-To: <20171013135058.q7vhufdtin42ddic@sigill.intra.peff.net>
On 10/13/2017 9:50 AM, Jeff King wrote:
> On Fri, Oct 13, 2017 at 09:39:14AM -0400, Derrick Stolee wrote:
>
>> Since I don't understand enough about the consumers to diff_tree_oid() (and
>> the fact that the recursive behavior may be wanted in some cases), I think
>> we can fix this in builtin/rev-list.c with this simple diff:
>>
>> ---
>>
>> diff --git a/builtin/rev-list.c b/builtin/rev-list.c
>> index ded1577424..b2e8e02cc8 100644
>> --- a/builtin/rev-list.c
>> +++ b/builtin/rev-list.c
>> @@ -285,6 +285,9 @@ int cmd_rev_list(int argc, const char **argv, const char
>> *prefix)
>>
>> git_config(git_default_config, NULL);
>> init_revisions(&revs, prefix);
>> +
>> + revs.pruning.flags = revs.pruning.flags & ~DIFF_OPT_RECURSIVE;
>> +
(Note: I'm running tests now and see that this breaks behavior.
Definitely not the solution we want.)
> Hmm, this feels wrong, because we _do_ want to recurse down and follow
> the pathspec to see if there are real changes.
>
> We should be comparing an empty tree and d0/d0/d0/d0 (or however deep
> your pathspec goes). We should be able to see immediately that the entry
> is not present between the two and not bother descending. After all,
> we've set the QUICK flag in init_revisions(). So the real question is
> why QUICK is not kicking in.
>
> -Peff
I'm struggling to understand your meaning. We want to walk from root to
d0/d0/d0/d0, but there is no reason to walk beyond that tree. But maybe
that's what the QUICK flag is supposed to do.
Thanks,
-Stolee
next prev parent reply other threads:[~2017-10-13 13:55 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-13 9:51 git-clone causes out of memory Constantine
2017-10-13 10:06 ` Mike Hommey
2017-10-13 10:26 ` Christian Couder
2017-10-13 10:37 ` Mike Hommey
2017-10-13 10:44 ` Christian Couder
2017-10-13 12:04 ` Junio C Hamano
2017-10-13 12:12 ` Constantine
2017-10-13 12:44 ` Jeff King
2017-10-13 13:15 ` Derrick Stolee
2017-10-13 13:39 ` Derrick Stolee
2017-10-13 13:50 ` Jeff King
2017-10-13 13:55 ` Derrick Stolee [this message]
2017-10-13 13:56 ` Jeff King
2017-10-13 14:10 ` Jeff King
2017-10-13 14:20 ` Jeff King
2017-10-13 14:25 ` Derrick Stolee
2017-10-13 14:26 ` Jeff King
2017-10-13 14:30 ` Derrick Stolee
2017-10-13 15:27 ` [PATCH] revision: quit pruning diff more quickly when possible Jeff King
2017-10-13 15:37 ` Derrick Stolee
2017-10-13 15:44 ` Jeff King
2017-10-14 2:43 ` Junio C Hamano
2017-10-13 12:35 ` git-clone causes out of memory Jeff King
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=53f98311-3c5f-9863-5f6c-bc4f25fad317@gmail.com \
--to=stolee@gmail.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hi-angel@yandex.ru \
--cc=mh@glandium.org \
--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).