From: Jeff King <firstname.lastname@example.org> To: Derrick Stolee <email@example.com> Cc: Constantine <firstname.lastname@example.org>, Junio C Hamano <email@example.com>, Christian Couder <firstname.lastname@example.org>, Mike Hommey <email@example.com>, git <firstname.lastname@example.org> Subject: Re: git-clone causes out of memory Date: Fri, 13 Oct 2017 10:10:18 -0400 [thread overview] Message-ID: <email@example.com> (raw) In-Reply-To: <firstname.lastname@example.org> On Fri, Oct 13, 2017 at 09:56:36AM -0400, Jeff King wrote: > On Fri, Oct 13, 2017 at 09:55:15AM -0400, Derrick Stolee wrote: > > > > 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. > > > > 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. > > Yes, that's exactly what it is for. When we see the first difference we > should say "aha, the caller only wanted to know whether there was a > difference, not what it was" and return immediately. See > diff_can_quit_early(). Hmm. So this patch makes it go fast: diff --git a/revision.c b/revision.c index d167223e69..b52ea4e9d8 100644 --- a/revision.c +++ b/revision.c @@ -409,7 +409,7 @@ static void file_add_remove(struct diff_options *options, int diff = addremove == '+' ? REV_TREE_NEW : REV_TREE_OLD; tree_difference |= diff; - if (tree_difference == REV_TREE_DIFFERENT) + if (tree_difference & REV_TREE_DIFFERENT) DIFF_OPT_SET(options, HAS_CHANGES); } But that essentially makes the conditional a noop (since we know we set either NEW or OLD above and DIFFERENT is the union of those flags). I'm not sure I understand why file_add_remove() would ever want to avoid setting HAS_CHANGES (certainly its companion file_change() always does). This goes back to Junio's dd47aa3133 (try-to-simplify-commit: use diff-tree --quiet machinery., 2007-03-14). Maybe I am missing something, but AFAICT this was always buggy. But since it only affects adds and deletes, maybe nobody noticed? I'm also not sure if it only causes a slowdown, or if this could cause us to erroneously mark something as TREESAME which isn't (I _do_ think people would have noticed that). -Peff
next prev parent reply other threads:[~2017-10-13 14:10 UTC|newest] Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-10-13 9:51 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 2017-10-13 13:56 ` Jeff King 2017-10-13 14:10 ` Jeff King [this message] 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 \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --subject='Re: git-clone causes out of memory' \ /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
Code repositories for project(s) associated with this 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).