From patchwork Mon Oct 9 10:55:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: karthik nayak X-Patchwork-Id: 13413391 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 91EF9E95A91 for ; Mon, 9 Oct 2023 10:55:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346110AbjJIKzs (ORCPT ); Mon, 9 Oct 2023 06:55:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42860 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345822AbjJIKzq (ORCPT ); Mon, 9 Oct 2023 06:55:46 -0400 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0516B8E for ; Mon, 9 Oct 2023 03:55:41 -0700 (PDT) Received: by mail-ed1-x536.google.com with SMTP id 4fb4d7f45d1cf-523100882f2so7125741a12.2 for ; Mon, 09 Oct 2023 03:55:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696848940; x=1697453740; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1FiY2+5KerkCg3TRlt8yED0XiGRko5TMen1uOL/Q64Y=; b=bhVrZ31fS3m/LjjpPGTL9zoUzFmx+aOZ8n0+jNeCCR8KExEuGGZD58HrQWkojSpY/O Gb0d8z3GvIJS0sb+WxRF9CKqimRoG5oynzlB2l9hnu9d3dEvXre1T7WFLGNDy0S7t5iY v4NERx3dRFHojf5CSPHQmLYUZNqWXW2XjG3KDbtbq+BZyStBVIMKYH0+C67KCqmMTT3J oflLnFeQBdsQHnm7k9lMxThan6DOBPl2v+Z73xSHPp5y4CPpNhImllwyauukWZGS7xfv dvBybz595Wf+0lHe/mpNiyVRDlCB05EoMzoS/MWHGFiGo61fLkjOqu8kgoN+vtZ5bCf4 KmSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696848940; x=1697453740; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1FiY2+5KerkCg3TRlt8yED0XiGRko5TMen1uOL/Q64Y=; b=tEzJKS+WOXpVJsqqjVMR9BPstfSDdpC/FdNGcSnmEaQeNMXIC9FnZoOUkB8li0FW82 x4Yo9DtvCwz76A9Wpavwe+p69MKZSr/yEzpvKC2yGqwWlI5Uxo7uYdlIpIhje9HeGpye Kpq9bjU9D0/RBcnEv2qsJLL4iRYXys4l58LPuDT3oBwj8Np7OgYIqej2N/RyZ5RA7mt/ yAnxz9irPrZ4Ek007KT87XOp3W4GvTMWGY5e7Umd83THY2+7tgKgAc4tHSSsRsPhRgX6 ibN9uzeEk7SRZYKuS18eZCWLS75gXnt/NCv9K5cGCj9APGaD83GfXhTZvT2GfDC6OsjO aTew== X-Gm-Message-State: AOJu0YynQzAyb8eUov3qtEGbEyzOURgGg54ePLcnOEvecPJEulj+Fn4p fGyquqZdCC3ye33z2HVAiqNhcV7bDKgbng== X-Google-Smtp-Source: AGHT+IGHk1jy2P2Tj7kCcthj+CBGT9yt4DqBLbXokK0d66kKfNJKccizHveo24MMzCevf1d1SKH6Jg== X-Received: by 2002:a50:ee8f:0:b0:531:3e89:1bef with SMTP id f15-20020a50ee8f000000b005313e891befmr12811690edr.32.1696848939726; Mon, 09 Oct 2023 03:55:39 -0700 (PDT) Received: from worklaptop.fritz.box ([2a02:2454:56d:f00:47bc:9393:72b0:bdf2]) by smtp.gmail.com with ESMTPSA id ca15-20020aa7cd6f000000b005331f6d4a30sm5906800edb.56.2023.10.09.03.55.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 03:55:39 -0700 (PDT) From: Karthik Nayak To: git@vger.kernel.org Cc: Karthik Nayak Subject: [PATCH 1/3] revision: rename bit to `do_not_die_on_missing_objects` Date: Mon, 9 Oct 2023 12:55:26 +0200 Message-ID: <20231009105528.17777-2-karthik.188@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231009105528.17777-1-karthik.188@gmail.com> References: <20231009105528.17777-1-karthik.188@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org The bit `do_not_die_on_missing_tree` is used in revision.h to ensure the revision walker does not die when encountering a missing tree. This is currently exclusively set within `builtin/rev-list.c` to ensure the `--missing` option works with missing trees. In the upcoming commits, we will extend `--missing` to also support missing commits. So let's rename the bit to `do_not_die_on_missing_objects`, which is object type agnostic and can be used for both trees/commits. Signed-off-by: Karthik Nayak --- builtin/reflog.c | 2 +- builtin/rev-list.c | 2 +- list-objects.c | 2 +- revision.h | 17 +++++++++-------- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/builtin/reflog.c b/builtin/reflog.c index df63a5892e..9e369a5977 100644 --- a/builtin/reflog.c +++ b/builtin/reflog.c @@ -298,7 +298,7 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix) struct rev_info revs; repo_init_revisions(the_repository, &revs, prefix); - revs.do_not_die_on_missing_tree = 1; + revs.do_not_die_on_missing_objects = 1; revs.ignore_missing = 1; revs.ignore_missing_links = 1; if (verbose) diff --git a/builtin/rev-list.c b/builtin/rev-list.c index ff715d6918..ea77489c38 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -561,7 +561,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix) } if (arg_missing_action) - revs.do_not_die_on_missing_tree = 1; + revs.do_not_die_on_missing_objects = 1; argc = setup_revisions(argc, argv, &revs, &s_r_opt); diff --git a/list-objects.c b/list-objects.c index c25c72b32c..47296dff2f 100644 --- a/list-objects.c +++ b/list-objects.c @@ -177,7 +177,7 @@ static void process_tree(struct traversal_context *ctx, is_promisor_object(&obj->oid)) return; - if (!revs->do_not_die_on_missing_tree) + if (!revs->do_not_die_on_missing_objects) die("bad tree object %s", oid_to_hex(&obj->oid)); } diff --git a/revision.h b/revision.h index 50091bbd13..c73c92ef40 100644 --- a/revision.h +++ b/revision.h @@ -212,18 +212,19 @@ struct rev_info { /* * Blobs are shown without regard for their existence. - * But not so for trees: unless exclude_promisor_objects + * But not so for trees/commits: unless exclude_promisor_objects * is set and the tree in question is a promisor object; * OR ignore_missing_links is set, the revision walker - * dies with a "bad tree object HASH" message when - * encountering a missing tree. For callers that can - * handle missing trees and want them to be filterable + * dies with a "bad object HASH" message when + * encountering a missing object. For callers that can + * handle missing trees/commits and want them to be filterable * and showable, set this to true. The revision walker - * will filter and show such a missing tree as usual, - * but will not attempt to recurse into this tree - * object. + * will filter and show such a missing object as usual, + * but will not attempt to recurse into this tree/commit + * object. The revision walker will also set the MISSING + * flag for such objects. */ - do_not_die_on_missing_tree:1, + do_not_die_on_missing_objects:1, /* for internal use only */ exclude_promisor_objects:1; From patchwork Mon Oct 9 10:55:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: karthik nayak X-Patchwork-Id: 13413393 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 39331E95A96 for ; Mon, 9 Oct 2023 10:55:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234504AbjJIKzv (ORCPT ); Mon, 9 Oct 2023 06:55:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42890 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346076AbjJIKzs (ORCPT ); Mon, 9 Oct 2023 06:55:48 -0400 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3E48B99 for ; Mon, 9 Oct 2023 03:55:43 -0700 (PDT) Received: by mail-ed1-x536.google.com with SMTP id 4fb4d7f45d1cf-5347e657a11so7267342a12.2 for ; Mon, 09 Oct 2023 03:55:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696848941; x=1697453741; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=f6TnQ1vaFjHTDr0P4PWPFgZC7Ma0ongoXkP+orTCGcI=; b=TH8Itg7QuCgRZVxoRMCzwlKOO2J8lJ+QFWiPBOYvbA4on+Ob/+oe6IFGGESsjQfQFJ nQSdr5cLKbO/sI17FRGFpGB6KayxBbXHd0X9N1TSbcBTP/qPSK1kG4jPVw6zS2CdeQNk RHhZBUkrQyiIpoEqQULbYTfe/5AeeXEj77NwiWfuZgTF9VVXM1s4UmAS62C6P4yAj/QG Weaxd/4XcvRerHapl6+MdvWxnG2T2Y4nQYIGR+66mUjJMrzR0pCv3NTfKGaXe10SnWsd gkY1BOGbk9qio7p+bqlMY1sX9RP8yOAV1oBQRXnQylld9x2O6GchQMCxnygLQI54tZ0w o1/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696848941; x=1697453741; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=f6TnQ1vaFjHTDr0P4PWPFgZC7Ma0ongoXkP+orTCGcI=; b=IR9eeUxWKNRbJflHh/WUXhJOBFFjuP9hmM9/40vHGbd9KHq9qIYKH66OBrX5NoTnh1 xuDHP2ridv7Ec0ItrGipohjANymS/dkNkcLI3QZDXGdUG2LT4m8Fc+hHveyYK3pNP2q4 EBPAEO7bmLPHfu+50ukDjAUvrSKBe3yk//ln1C7ywQNhzipLsu5oZSPKA6VenJsbJzeX hjdJ5I0BFlf6Z0sBVQkm0z9wNxrSX/VsOS0qTSFWf+I7hvy0kl5PuWDElu0MPTVQkx8P EUUxtPBIHGSRcA8lpoo14pL9H4AWc+i1fuY10yXpxEW10CPAIrxqQVv5Z8eLzig1qV8j 9Lxw== X-Gm-Message-State: AOJu0Yyrttroctw+wWjn/qU23qAhhmd6hHoWfiheQgZDvflv6XihszIf QGKoPPdL92MMc9NG1Gus43Qkc6ApzP/I0A== X-Google-Smtp-Source: AGHT+IFSLO4cdoU9qpFk/zqqrZjRhqsYzunqjOJBdE0nDlNdFYp1zjuywBah4BSeRt7FSoiz5Wu6ig== X-Received: by 2002:a05:6402:1b05:b0:523:bfec:490f with SMTP id by5-20020a0564021b0500b00523bfec490fmr13676297edb.0.1696848941324; Mon, 09 Oct 2023 03:55:41 -0700 (PDT) Received: from worklaptop.fritz.box ([2a02:2454:56d:f00:47bc:9393:72b0:bdf2]) by smtp.gmail.com with ESMTPSA id ca15-20020aa7cd6f000000b005331f6d4a30sm5906800edb.56.2023.10.09.03.55.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 03:55:40 -0700 (PDT) From: Karthik Nayak To: git@vger.kernel.org Cc: Karthik Nayak Subject: [PATCH 2/3] rev-list: move `show_commit()` to the bottom Date: Mon, 9 Oct 2023 12:55:27 +0200 Message-ID: <20231009105528.17777-3-karthik.188@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231009105528.17777-1-karthik.188@gmail.com> References: <20231009105528.17777-1-karthik.188@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org The `show_commit()` function already depends on `finish_commit()`, and in the upcoming commit, we'll also add a dependency on `finish_object__ma()`. Since in C symbols must be declared before they're used, let's move `show_commit()` below both `finish_commit()` and `finish_object__ma()`, so the code is cleaner as a whole without the need for declarations. Signed-off-by: Karthik Nayak --- builtin/rev-list.c | 85 +++++++++++++++++++++++----------------------- 1 file changed, 42 insertions(+), 43 deletions(-) diff --git a/builtin/rev-list.c b/builtin/rev-list.c index ea77489c38..98542e8b3c 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -100,7 +100,48 @@ static off_t get_object_disk_usage(struct object *obj) return size; } -static void finish_commit(struct commit *commit); +static inline void finish_object__ma(struct object *obj) +{ + /* + * Whether or not we try to dynamically fetch missing objects + * from the server, we currently DO NOT have the object. We + * can either print, allow (ignore), or conditionally allow + * (ignore) them. + */ + switch (arg_missing_action) { + case MA_ERROR: + die("missing %s object '%s'", + type_name(obj->type), oid_to_hex(&obj->oid)); + return; + + case MA_ALLOW_ANY: + return; + + case MA_PRINT: + oidset_insert(&missing_objects, &obj->oid); + return; + + case MA_ALLOW_PROMISOR: + if (is_promisor_object(&obj->oid)) + return; + die("unexpected missing %s object '%s'", + type_name(obj->type), oid_to_hex(&obj->oid)); + return; + + default: + BUG("unhandled missing_action"); + return; + } +} + +static void finish_commit(struct commit *commit) +{ + free_commit_list(commit->parents); + commit->parents = NULL; + free_commit_buffer(the_repository->parsed_objects, + commit); +} + static void show_commit(struct commit *commit, void *data) { struct rev_list_info *info = data; @@ -219,48 +260,6 @@ static void show_commit(struct commit *commit, void *data) finish_commit(commit); } -static void finish_commit(struct commit *commit) -{ - free_commit_list(commit->parents); - commit->parents = NULL; - free_commit_buffer(the_repository->parsed_objects, - commit); -} - -static inline void finish_object__ma(struct object *obj) -{ - /* - * Whether or not we try to dynamically fetch missing objects - * from the server, we currently DO NOT have the object. We - * can either print, allow (ignore), or conditionally allow - * (ignore) them. - */ - switch (arg_missing_action) { - case MA_ERROR: - die("missing %s object '%s'", - type_name(obj->type), oid_to_hex(&obj->oid)); - return; - - case MA_ALLOW_ANY: - return; - - case MA_PRINT: - oidset_insert(&missing_objects, &obj->oid); - return; - - case MA_ALLOW_PROMISOR: - if (is_promisor_object(&obj->oid)) - return; - die("unexpected missing %s object '%s'", - type_name(obj->type), oid_to_hex(&obj->oid)); - return; - - default: - BUG("unhandled missing_action"); - return; - } -} - static int finish_object(struct object *obj, const char *name UNUSED, void *cb_data) { From patchwork Mon Oct 9 10:55:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: karthik nayak X-Patchwork-Id: 13413392 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 726F3E95A8E for ; Mon, 9 Oct 2023 10:55:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346128AbjJIKzt (ORCPT ); Mon, 9 Oct 2023 06:55:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42896 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346077AbjJIKzs (ORCPT ); Mon, 9 Oct 2023 06:55:48 -0400 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B540AA3 for ; Mon, 9 Oct 2023 03:55:45 -0700 (PDT) Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-53639fb0ba4so7494384a12.0 for ; Mon, 09 Oct 2023 03:55:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696848944; x=1697453744; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=oShj0GWwwQtFp2tY5URs9CfnWxZ+8O3OPL0Zr+7YEks=; b=dBc1Pd39UPneI4qJoBydfEDmmRVT1Jlw2yQR5/QgheMJMQMrBPvdg1Kz4kr/Vg5+Kp MvUHXNQ1C3RmADtT2cFxiqpNNuW/nr7xd4DpuZtmy7YryuEB3AVJwmn+LXvx8yV5Upbv uDFYMWobJCDng1vxvSTdvsd40b3Yn9h2qjkKldZERRHG48Z0adzNyLcUT6UYo9vvW352 sh8/LmktzKOwR+dpo3Tsv6ycNjuQqQdXpYlN36b2Y/AgmustdN4BiDlMLsNQU67W7Oke dnNi6Drb6OwEo1ziDvPGBkRQjIO3t0I8thDVdzfNJ27Ain66r03FPM2PwvHK0CIrKgvj AcZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696848944; x=1697453744; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oShj0GWwwQtFp2tY5URs9CfnWxZ+8O3OPL0Zr+7YEks=; b=fihJoYzTqqM89ENQehaT911YD+lckS/sBQqCcpIqO+bX7gVQGsqpFT40Btf63fOxmp HTskkjcMqEYtLBDHwVqoAm56mj4IInvEMMByHQunSsK1LJrRy0fMPYSRakePldfcDzV9 rHBIsAbf++zxmUWSMMLev7Ro8Ksm/MvfwAUlBIej1eUgrFbhd7uY9Pmy2Bvu+EMCsOsZ MkPQuvy0UiJbioBr7V8by3Ql/plKSRzqWkFcBWKAKXjvSYG6NaPImjQm+CtUBbv3vm2z Zadwnk4LbbRRDiwOjjB+an/T++hMHjMQuXEZ0YrEIG9J/B33FBDz5x5cfGulFHpQ2LEO OlwA== X-Gm-Message-State: AOJu0Yw8HCBBj3OFkL612bFDbro7GGScFh7sTH+nJJ5QLrTMNDnfRMDj XRjqX1K7fN0ZTXBP/k+OCLUO5xQht0N6lQ== X-Google-Smtp-Source: AGHT+IHm/TkGNojqiSGxzE2yvN7qRQ7kKO2MF2fiZ0qIto/NR1LCNrGk4gs4PK0VQwMZ1OYQTweYaw== X-Received: by 2002:a05:6402:785:b0:523:ae0a:a446 with SMTP id d5-20020a056402078500b00523ae0aa446mr15552725edy.24.1696848943550; Mon, 09 Oct 2023 03:55:43 -0700 (PDT) Received: from worklaptop.fritz.box ([2a02:2454:56d:f00:47bc:9393:72b0:bdf2]) by smtp.gmail.com with ESMTPSA id ca15-20020aa7cd6f000000b005331f6d4a30sm5906800edb.56.2023.10.09.03.55.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 03:55:43 -0700 (PDT) From: Karthik Nayak To: git@vger.kernel.org Cc: Karthik Nayak Subject: [PATCH 3/3] rev-list: add commit object support in `--missing` option Date: Mon, 9 Oct 2023 12:55:28 +0200 Message-ID: <20231009105528.17777-4-karthik.188@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231009105528.17777-1-karthik.188@gmail.com> References: <20231009105528.17777-1-karthik.188@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org The `--missing` object option in rev-list currently works only with missing blobs/trees. For missing commits the revision walker fails with a fatal error. Let's extend the functionality of `--missing` option to also support commit objects. This is done by adding a new `MISSING` flag that the revision walker sets whenever it encounters a missing tree/commit. The revision walker will now continue the traversal and call `show_commit()` even for missing commits. In rev-list we can then check for this flag and call the existing code for parsing `--missing` objects. A scenario where this option would be used is to find the boundary objects between different object directories. Consider a repository with a main object directory (GIT_OBJECT_DIRECTORY) and one or more alternate object directories (GIT_ALTERNATE_OBJECT_DIRECTORIES). In such a repository, using the `--missing=print` option while disabling the alternate object directory allows us to find the boundary objects between the main and alternate object directory. Signed-off-by: Karthik Nayak --- builtin/rev-list.c | 6 +++ object.h | 2 +- revision.c | 9 ++++- revision.h | 3 ++ t/t6022-rev-list-missing.sh | 74 +++++++++++++++++++++++++++++++++++++ 5 files changed, 91 insertions(+), 3 deletions(-) create mode 100755 t/t6022-rev-list-missing.sh diff --git a/builtin/rev-list.c b/builtin/rev-list.c index 98542e8b3c..604ae01d0c 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -149,6 +149,12 @@ static void show_commit(struct commit *commit, void *data) display_progress(progress, ++progress_counter); + if (revs->do_not_die_on_missing_objects && + commit->object.flags & MISSING) { + finish_object__ma(&commit->object); + return; + } + if (show_disk_usage) total_disk_usage += get_object_disk_usage(&commit->object); diff --git a/object.h b/object.h index 114d45954d..12913e6116 100644 --- a/object.h +++ b/object.h @@ -62,7 +62,7 @@ void object_array_init(struct object_array *array); /* * object flag allocation: - * revision.h: 0---------10 15 23------27 + * revision.h: 0---------10 15 22------27 * fetch-pack.c: 01 67 * negotiator/default.c: 2--5 * walker.c: 0-2 diff --git a/revision.c b/revision.c index e789834dd1..615645d3d1 100644 --- a/revision.c +++ b/revision.c @@ -1168,7 +1168,8 @@ static int process_parents(struct rev_info *revs, struct commit *commit, for (parent = commit->parents; parent; parent = parent->next) { struct commit *p = parent->item; int gently = revs->ignore_missing_links || - revs->exclude_promisor_objects; + revs->exclude_promisor_objects || + revs->do_not_die_on_missing_objects; if (repo_parse_commit_gently(revs->repo, p, gently) < 0) { if (revs->exclude_promisor_objects && is_promisor_object(&p->object.oid)) { @@ -1176,7 +1177,11 @@ static int process_parents(struct rev_info *revs, struct commit *commit, break; continue; } - return -1; + + if (!revs->do_not_die_on_missing_objects) + return -1; + else + p->object.flags |= MISSING; } if (revs->sources) { char **slot = revision_sources_at(revs->sources, p); diff --git a/revision.h b/revision.h index c73c92ef40..07906bc3bc 100644 --- a/revision.h +++ b/revision.h @@ -41,6 +41,9 @@ /* WARNING: This is also used as REACHABLE in commit-graph.c. */ #define PULL_MERGE (1u<<15) +/* WARNING: This is also used as NEEDS_BITMAP in pack-bitmap.c. */ +#define MISSING (1u<<22) + #define TOPO_WALK_EXPLORED (1u<<23) #define TOPO_WALK_INDEGREE (1u<<24) diff --git a/t/t6022-rev-list-missing.sh b/t/t6022-rev-list-missing.sh new file mode 100755 index 0000000000..bbff66e4fc --- /dev/null +++ b/t/t6022-rev-list-missing.sh @@ -0,0 +1,74 @@ +#!/bin/sh + +test_description='handling of missing objects in rev-list' + +TEST_PASSES_SANITIZE_LEAK=true +. ./test-lib.sh + +# We setup the repository with two commits, this way HEAD is always +# available and we can hide commit 1. +test_expect_success 'create repository and alternate directory' ' + test_commit 1 && + test_commit 2 +' + +for obj in "HEAD~1" "HEAD~1^{tree}" "HEAD:1.t" +do + test_expect_success "rev-list --missing=error fails with missing object $obj" ' + oid="$(git rev-parse $obj)" && + path=".git/objects/$(test_oid_to_path $oid)" && + + mv "$path" "$path.hidden" && + test_when_finished "mv $path.hidden $path" && + + test_must_fail git rev-list --missing=error --objects \ + --no-object-names HEAD + ' +done + +for obj in "HEAD~1" "HEAD~1^{tree}" "HEAD:1.t" +do + for action in "allow-any" "print" + do + test_expect_success "rev-list --missing=$action with missing $obj" ' + oid="$(git rev-parse $obj)" && + path=".git/objects/$(test_oid_to_path $oid)" && + + # Before the object is made missing, we use rev-list to + # get the expected oids. + git rev-list --objects --no-object-names \ + HEAD ^$obj >expect.raw && + + # Since both the commits have the `1.t` blob, rev-list + # will print it since its reachable from either commit. Unless + # the blob itself is missing. + if [ $obj != "HEAD:1.t" ]; then + echo $(git rev-parse HEAD:1.t) >>expect.raw + fi && + + mv "$path" "$path.hidden" && + test_when_finished "mv $path.hidden $path" && + + git rev-list --missing=$action --objects --no-object-names \ + HEAD >actual.raw && + + # When the action is to print, we should also add the missing + # oid to the expect list. + case $action in + allow-any) + ;; + print) + grep ?$oid actual.raw && + echo ?$oid >>expect.raw + ;; + esac && + + sort actual.raw >actual && + sort expect.raw >expect && + test_cmp expect actual + ' + done +done + + +test_done