From patchwork Wed Oct 3 23:04:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Tan X-Patchwork-Id: 10625383 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8D1C115A6 for ; Wed, 3 Oct 2018 23:05:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7202F28E0D for ; Wed, 3 Oct 2018 23:05:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 626B928E40; Wed, 3 Oct 2018 23:05:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 301AA28E0D for ; Wed, 3 Oct 2018 23:05:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726279AbeJDFzZ (ORCPT ); Thu, 4 Oct 2018 01:55:25 -0400 Received: from mail-ua1-f74.google.com ([209.85.222.74]:39222 "EHLO mail-ua1-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725882AbeJDFzZ (ORCPT ); Thu, 4 Oct 2018 01:55:25 -0400 Received: by mail-ua1-f74.google.com with SMTP id t14-v6so1577813uao.6 for ; Wed, 03 Oct 2018 16:04:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=Nawr343adD0n05O58wcD4FVh/Cccr365ZEHIIhlZ96c=; b=kbmsn6ZcrZuvWNNsVMUQgadtjQT+RAzEticAyI+b9SEf2gcPCyzQnb5JKkZLC8Goas zFnshO3TfonCRSCmaSr6AGEac0jPuPaAbSMO9FGYvQRx1R03Mzu9bNuCpyYqw4oLnehM e+o1Ryu4cwlVxKUJ8ng9G7fiDdqbiGIXUf4tONU1GmgGWSaeoWL5hKYzFsZv1Ov2EXqe vIb3NkGDSDyGNZPLG5PLvlbSu6H/HkV45frlNWk8TuZFvj6omWZl11C9Mxfnf/72Pq69 pi0xomveBCA3bR6JUowWE3UqWSTg0mI32W8d/LkAARcROHRRwiS/bI91nMjeIvckgea4 6Vdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=Nawr343adD0n05O58wcD4FVh/Cccr365ZEHIIhlZ96c=; b=fzxzHJDxRhDiNK29aM8odygh5CW5Qat6lyvd8LQ5qXIAxqWAuWpcVjFEvY8/po1h9X nzHrXWEQ64TqEfEaQqWXtbrZllAXaSUQLH5k+yPCLR/kdnCTLezwm6Bb4Q29ANW24dtq hf+NvoL/koGeo3+tkcrk4Dx2mztliihXPChJG+TFRPBACUWX6nAvBIVvwLnaIMWW24+2 85f3cpAjbt3pDd7/eR4lsPNinRL8uNwHzKPdSroZZBvyvwDKlTjZGXv+gfGziBdtGDRC WNb5Nsh9vaIbTtJMw78wmFiIBRVBlOaSL/na1bsPcc8r4Rdss2ywZiUuwpl9lePTfH4z 6Iaw== X-Gm-Message-State: ABuFfogyhnt62CLlmXSGeJ0aoXIeJtbeAy9CwqiWcNjnLATwH5FPz2sl Sp6QVmJA4uhBCowX83HbPDRWuPN2IU855wES7ETdNCoLQOdMt9EUcDL4Hbu7D5XvnNKgbMhYn7f UMAj88TTPFsqQzprC2IG+RhpHlhLL+7LJ654aH97bFIHJy3ihsOtLz8IXmENHqRpuy98YVFu1vh rG X-Google-Smtp-Source: ACcGV63gKUAfFTd0L3E09wjyzundsK4cqbG/LOZepWKC9qTE7pW1ZpQR6XJjFXBprMkYib57t56/m+NvxLw/EhM6kkAo X-Received: by 2002:a1f:b915:: with SMTP id j21-v6mr3292694vkf.13.1538607898230; Wed, 03 Oct 2018 16:04:58 -0700 (PDT) Date: Wed, 3 Oct 2018 16:04:51 -0700 In-Reply-To: <20180924154516.48704-1-jonathantanmy@google.com> Message-Id: Mime-Version: 1.0 References: <20180924154516.48704-1-jonathantanmy@google.com> X-Mailer: git-send-email 2.19.0.605.g01d371f741-goog Subject: [PATCH v2 0/2] Lazy fetch bug fix (and feature that reveals it) From: Jonathan Tan To: git@vger.kernel.org Cc: Jonathan Tan , gitster@pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP > This seems to break 5520 and 5616 when merged to 'pu'. > > It seems that merging master to md/filter-trees and then applying > this is sufficient to break 5616. I verified that 5616 is broken on [master + md/filter-trees + my patch], and after investigation, found a bug in the lazy fetch implementation. Patch 1 contains a fix, and more information about that bug. Patch 2 is the original patch, updated with the commit message I suggested [1] in reply to Junio's comment. I bundled these patches together because patch 2 (in combination with certain other commits) reveals the bug that patch 1 fixes, and to make it easier for others to verify that these patches together pass all tests when rebased on [master + md/filter-trees] or 'pu' (at least, as of the time of writing). [1] https://public-inbox.org/git/20180927183718.89804-1-jonathantanmy@google.com/ Jonathan Tan (2): fetch-pack: avoid object flags if no_dependents fetch-pack: exclude blobs when lazy-fetching trees fetch-pack.c | 115 +++++++++++++++++++++++++-------------- fetch-pack.h | 7 +++ t/t0410-partial-clone.sh | 41 ++++++++++++++ 3 files changed, 121 insertions(+), 42 deletions(-)