From patchwork Thu Oct 19 12:10:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: karthik nayak X-Patchwork-Id: 13428790 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5BEFB1EB27 for ; Thu, 19 Oct 2023 12:10:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="f+/tMTp3" Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B7E62D75 for ; Thu, 19 Oct 2023 05:10:30 -0700 (PDT) Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-9b1ebc80d0aso1238290566b.0 for ; Thu, 19 Oct 2023 05:10:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697717429; x=1698322229; 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=jTrEXOeFol6AmaA9KXR+u1DxcdpMVWbMe6+zVa2nt9I=; b=f+/tMTp30E5CGNqn+1gW66ZROAx6pbQDTCgjoa+foy74Vtx7PmQwgWB4T6KDA++51V ZILWAP3/KaJ9zN9al6VXg4EE7BcJ8GjnauC0VvoISHbk/5KYd9qT7nbI+HLpzkb5nxtB 097q6ERC1GxpkoNaF2fEmlNzQxZkBTwPVJ5Xc8j8+U2pqKwQitiqotoeIIsABOxgk+dg RcFRKUaUDW4Te8/HUOcUllhR6oWkUXA1kCEQ3nfMY9VevdP8cdLEmZZvBDDxgCR23BA3 vvglNYXKlP+/FVqKjPhXpD9y0NBV6ytB6lR9/1d78hK+noq9uFRF8Qar0sLe2XX0LafQ Xm8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697717429; x=1698322229; 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=jTrEXOeFol6AmaA9KXR+u1DxcdpMVWbMe6+zVa2nt9I=; b=a5U0/UJTGqDPKH7du8VMmb9p+pIBLJPj19x7scSeQUptdq2HoEn/kiNm+/asgdC18I k+TnSmDBgTeoWfnMN/nbvdF85DOQyL5oZsdvSRosvDMftynD605a/b8Dk+4o1/LonwGl 9ezFeT8bxdegMF8SGgCxh3chFLS1enZQI7pNz3FG0ahp38ByQYnKnC613d60x8EmyuvS gzdVDwz3gGuUqvQbAJuX1i7IpgqF6Ils8SmaqmgdEo3VbLztaY79sFAcF83ZJeFbHfb6 jvg4fVPaGcbY/DHdXuAj7zVmdKCdr7iVqmWh2N8VQgbZ3ttTWl7KxDW1LES1zgAu+cDg LTYw== X-Gm-Message-State: AOJu0YzC59njmfLm0Q06+NJF7QuuhDo1u9xl6wLxmUWSfpeC8rEbnXLF LUlVOIOXKJG4AqDQRnHAqjdDgJOmCQJO5Q== X-Google-Smtp-Source: AGHT+IGwCd8AcWFcRicpMOAbBIUvigKAQt64lUfuiNOzfiSTFDfN/ZR7ttKpSPYWeIUbTpMUe6w9sw== X-Received: by 2002:a17:907:7211:b0:9b2:df16:851d with SMTP id dr17-20020a170907721100b009b2df16851dmr1670614ejc.57.1697717428748; Thu, 19 Oct 2023 05:10:28 -0700 (PDT) Received: from laptop.fritz.box ([2a02:2454:56d:f00:d5ee:6231:6f45:fa9b]) by smtp.gmail.com with ESMTPSA id oz6-20020a170906cd0600b0099ddc81903asm3469212ejb.221.2023.10.19.05.10.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Oct 2023 05:10:28 -0700 (PDT) From: Karthik Nayak To: karthik.188@gmail.com Cc: git@vger.kernel.org, gitster@pobox.com, ps@pks.im Subject: [PATCH v3 1/3] revision: rename bit to `do_not_die_on_missing_objects` Date: Thu, 19 Oct 2023 14:10:22 +0200 Message-ID: <20231019121024.194317-2-karthik.188@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231019121024.194317-1-karthik.188@gmail.com> References: <20231016103830.56486-1-karthik.188@gmail.com> <20231019121024.194317-1-karthik.188@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 Thu Oct 19 12:10:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: karthik nayak X-Patchwork-Id: 13428791 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 894EB1EB4F for ; Thu, 19 Oct 2023 12:10:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="jkUYK12r" Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE63310C6 for ; Thu, 19 Oct 2023 05:10:31 -0700 (PDT) Received: by mail-ej1-x62c.google.com with SMTP id a640c23a62f3a-9bda758748eso977377166b.2 for ; Thu, 19 Oct 2023 05:10:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697717430; x=1698322230; 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=QOwXsI52km5DpnUY5RrPwM/CNPApiMy5mcJkv8NgVew=; b=jkUYK12rplED1EaCSOSgowHAxheucg1xtL6JTlJjU8KLmAu31pS+IeICvRhigo8kVU TZGLrHTZuXwBHgyrtx5ZOfQDMNGjloIiTc44WF2VVa6E4bJe9wgaDL4TxQuX1HWsrO1g qluTIv1+YE5s0h6iuIeKM+yP/ZnXS3V4olYDzQskxi29302+k1pbL3WcZXm22TIi7f+9 vxH/YLOr6cP+wlq4nbCmxGek30CdviFyeBsuXScU9xKrQsU0Gvhmg2RFh0JB20URXcVB 8LKRnqZC3pFl6fB2l6H1Pyl/vBfHwe1jsgWBJ6Fu/MqBXe49m2ObK5Gb+ExTCZAxlUQ9 /qhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697717430; x=1698322230; 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=QOwXsI52km5DpnUY5RrPwM/CNPApiMy5mcJkv8NgVew=; b=egoV0GqOq4lxQH79HDwEpqLtrVKYsh1R3pyNxSX8otJiaDtDkVVFd9CKgVwIFjpZxD RT55j94zOUTqj/Agq7G+yUaoqS6Rc54Kngwio36uBBXUqq+pRfXct/8GscSWMFsctIu0 FLRMbX+LXk3kWyUnoPgPY0UScusCjxgb63/eejuV95xfBX88bmr5Kn0xTeN3BtwnL/wA XM5A8xMDRP2kCLq/fdAE64446sES/U1HWwukq9ICVoEIv+UZQz5afmioiZcU30UgOw3H cbHYT0aYbQ/i68mieF+kfK/YiPRk3Ou/Gp6MZJOcmvRr6At0stcNMMXG1KnZnv9/GwmQ QmZg== X-Gm-Message-State: AOJu0YzN7l9wT4Zs20GgIMRovV7/DoxrGoIHHJntSSPTCq4PpyH9zI4V OrNyHiC//oAPCCHbYh29ySY= X-Google-Smtp-Source: AGHT+IH4xUp9YaN2yG5l8QMpB4Za8vUsQ5myiDlnKVyDfo9z4Lf7KifOvA8sLJAjnH971w6KgCO4EQ== X-Received: by 2002:a17:907:6e87:b0:9be:d55a:81ba with SMTP id sh7-20020a1709076e8700b009bed55a81bamr1285810ejc.65.1697717429620; Thu, 19 Oct 2023 05:10:29 -0700 (PDT) Received: from laptop.fritz.box ([2a02:2454:56d:f00:d5ee:6231:6f45:fa9b]) by smtp.gmail.com with ESMTPSA id oz6-20020a170906cd0600b0099ddc81903asm3469212ejb.221.2023.10.19.05.10.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Oct 2023 05:10:29 -0700 (PDT) From: Karthik Nayak To: karthik.188@gmail.com Cc: git@vger.kernel.org, gitster@pobox.com, ps@pks.im Subject: [PATCH v3 2/3] rev-list: move `show_commit()` to the bottom Date: Thu, 19 Oct 2023 14:10:23 +0200 Message-ID: <20231019121024.194317-3-karthik.188@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231019121024.194317-1-karthik.188@gmail.com> References: <20231016103830.56486-1-karthik.188@gmail.com> <20231019121024.194317-1-karthik.188@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 Thu Oct 19 12:10:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: karthik nayak X-Patchwork-Id: 13428792 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A6A0120309 for ; Thu, 19 Oct 2023 12:10:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="EXNVmygP" Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5FA611705 for ; Thu, 19 Oct 2023 05:10:32 -0700 (PDT) Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-9ba1eb73c27so1296270066b.3 for ; Thu, 19 Oct 2023 05:10:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697717431; x=1698322231; 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=VViLECbZQZYHOeMi49bgWHX8CBSBKuxlCamKFWqk9v0=; b=EXNVmygP5xiLHurCW11rUZUJOoETdHRPEQkSzPTOUs6ZmoJLvOernT3E8ay8EAP4f0 dc0S/NYZVsbJDarvMoInqiKTiUETVWCynAPPQtBfz8Z3mENXPYxP2RA/So4DQTPHFwqj 2JhcGkix9eAVCYpgOoQhE68yNW4B27Db/deYQlHdy36BABsco4bnzWcx+Y12j/EIIuru TPEWwKXtrDF+ajEaEeA/JZE7I/gRq/MGR2a7b1l8zUqSRGc9ppQFoe6O7Y4L42pKDKrg c18ncVWBmh58fel0DhejjMLszXNPVIjEsIXe9NSqsqkqxQbMRkQZnxrr87Ivyuj1g3dH n9xQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697717431; x=1698322231; 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=VViLECbZQZYHOeMi49bgWHX8CBSBKuxlCamKFWqk9v0=; b=uLfbhBwNB9o2XUUZzgzLOxhRPPKOxy4HIrwgp/Yh1HWdJhgi2OpKx1qGoI9bnLtmrC u3X+CR4yappeUU15I1WULADn9W7FkSoiZkziTmnfDgI66EUFcSJT6XBWfaFqbnGIyHAQ CSqL/EaNRnEHoLmi/bPEK/Zepz6P8d83BPRyymE/bo4r20xW72NSBNlW14Ax/AytZfL+ YQndujjnX/fwzE++1gws3aif5LtYgg/ikNDQcMRmj/x6P4jjsFIa6F7D7gHdPBtQbOCr GhivGct4D0B01PzBvwgrVWz4L9xQrCVVki3daUbxrG0+12sPBPwxAor2ylQJJe2Jlyxv 4VGg== X-Gm-Message-State: AOJu0Yx6W/DgHj0GtdoKiZqSef/KSFj0IRYDTpExO1JvmQ0Li+uAknAe bnWXfqaY6C3bL2/edY4lHMQ= X-Google-Smtp-Source: AGHT+IGTHzrTSu2vzMWNVRH9wjAfGNfAo8jt0VnhFajAf0T0lyoM4IgPnOio9V3WlRLZQwJ9wjuv+w== X-Received: by 2002:a17:907:2d0f:b0:9c3:b3cb:29b8 with SMTP id gs15-20020a1709072d0f00b009c3b3cb29b8mr1868527ejc.0.1697717430651; Thu, 19 Oct 2023 05:10:30 -0700 (PDT) Received: from laptop.fritz.box ([2a02:2454:56d:f00:d5ee:6231:6f45:fa9b]) by smtp.gmail.com with ESMTPSA id oz6-20020a170906cd0600b0099ddc81903asm3469212ejb.221.2023.10.19.05.10.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Oct 2023 05:10:30 -0700 (PDT) From: Karthik Nayak To: karthik.188@gmail.com Cc: git@vger.kernel.org, gitster@pobox.com, ps@pks.im Subject: [PATCH v3 3/3] rev-list: add commit object support in `--missing` option Date: Thu, 19 Oct 2023 14:10:24 +0200 Message-ID: <20231019121024.194317-4-karthik.188@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231019121024.194317-1-karthik.188@gmail.com> References: <20231016103830.56486-1-karthik.188@gmail.com> <20231019121024.194317-1-karthik.188@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 +++ list-objects.c | 2 +- object.h | 4 +- revision.c | 11 ++++-- revision.h | 2 + t/t6022-rev-list-missing.sh | 74 +++++++++++++++++++++++++++++++++++++ 6 files changed, 93 insertions(+), 6 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/list-objects.c b/list-objects.c index 47296dff2f..60c5533721 100644 --- a/list-objects.c +++ b/list-objects.c @@ -387,7 +387,7 @@ static void do_traverse(struct traversal_context *ctx) * an uninteresting boundary commit may not have its tree * parsed yet, but we are not going to show them anyway */ - if (!ctx->revs->tree_objects) + if (!ctx->revs->tree_objects || commit->object.flags & MISSING) ; /* do not bother loading tree */ else if (repo_get_commit_tree(the_repository, commit)) { struct tree *tree = repo_get_commit_tree(the_repository, diff --git a/object.h b/object.h index 114d45954d..b76830fce1 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------28 * fetch-pack.c: 01 67 * negotiator/default.c: 2--5 * walker.c: 0-2 @@ -82,7 +82,7 @@ void object_array_init(struct object_array *array); * builtin/show-branch.c: 0-------------------------------------------26 * builtin/unpack-objects.c: 2021 */ -#define FLAG_BITS 28 +#define FLAG_BITS 29 #define TYPE_BITS 3 diff --git a/revision.c b/revision.c index 219dc76716..8100806068 100644 --- a/revision.c +++ b/revision.c @@ -1110,7 +1110,7 @@ static int process_parents(struct rev_info *revs, struct commit *commit, struct commit_list *parent = commit->parents; unsigned pass_flags; - if (commit->object.flags & ADDED) + if (commit->object.flags & (ADDED | MISSING)) return 0; commit->object.flags |= ADDED; @@ -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..d3c1ca0f4e 100644 --- a/revision.h +++ b/revision.h @@ -53,6 +53,8 @@ #define ANCESTRY_PATH (1u<<27) #define ALL_REV_FLAGS (((1u<<11)-1) | NOT_USER_GIVEN | TRACK_LINEAR | PULL_MERGE) +#define MISSING (1u<<28) + #define DECORATE_SHORT_REFS 1 #define DECORATE_FULL_REFS 2 diff --git a/t/t6022-rev-list-missing.sh b/t/t6022-rev-list-missing.sh new file mode 100755 index 0000000000..40265a4f66 --- /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 && + test_commit 3 +' + +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 && + + # Blobs are shared by all commits, so evethough a commit/tree + # might be skipped, its blob must be accounted for. + if [ $obj != "HEAD:1.t" ]; then + echo $(git rev-parse HEAD:1.t) >>expect.raw && + echo $(git rev-parse HEAD:2.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