From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-3.7 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_PASS, SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id CF1131F934 for ; Tue, 20 Apr 2021 13:38:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232558AbhDTNho (ORCPT ); Tue, 20 Apr 2021 09:37:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39970 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232449AbhDTNhl (ORCPT ); Tue, 20 Apr 2021 09:37:41 -0400 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 68CD6C06174A for ; Tue, 20 Apr 2021 06:37:08 -0700 (PDT) Received: by mail-wm1-x32d.google.com with SMTP id u187so701014wmb.0 for ; Tue, 20 Apr 2021 06:37:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=93JzT/X8Lq9M0rfcmdi54FEWCuPfn1NVdNk8bq0QCJA=; b=twkspK35VC6oIl8zIQHIY1rZb+TR+aeWztCWsJc17AW9mrRUl8HLZ7C8GAw8n3sexD ynFn2ii4FDL8XchrxdEIjoh8CDyWQJcOqBR997hO/6yc8XsYCKiRxO+Uj6B5OOeRiCNA J4/EeT1TeR325HY/wxOaYhcEdTDYVPRYHgmwv0ltL/i15DeIc/wihCf080toDqEmhHbK S/eY9G+TN0NYIblKB25RfMTCqGtVbeADqDaZO9envaaE6ObKuALsoKQ/mf1cVYaNciZ1 UZ50CX0+dkfKRosLYr6xv5VAFhwejKiM5K5Kbsvw2GzD/OC5V/KXICvxaDzLI9HNkEJh uALA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=93JzT/X8Lq9M0rfcmdi54FEWCuPfn1NVdNk8bq0QCJA=; b=kx7dKtCJW7fWD80HGVyA1Y3PL7B1nRrROUzjk7aGN6C/ti2CN8sNF/PmRndo7pPjB+ +Ru4rnN53H5DTkwSKZzE+Cw8rZk14Rk92h4ar1zKTTs/2vdspOcwG4+pttVtPRBNf7jm ZI2/MJI8ItFzfVQg2AwUYuxKvUWvhhOg1bG80YQzpBAqFn0iGRWcMOuzRdC8ONEysuzN SB369pVQIGKqdrnGCNb+0p6zGFprymelQyWTHPBN/fAGFQePhE7eTbHphPvi41OPc6Cz MtN0pq0oaSJ+o1UhObImT76Fh+u7TpCgbGCFnBqcRZsWqAX1p2Cts3gCGuuixceztJsN Jl2w== X-Gm-Message-State: AOAM5311BoFCYd9UG70XrtRJIzgHdIhg+4p6BwUuLlpvecQDXS2+/Xt7 4oZBV0ngiFlsV5/368ZGThHAha6NAw7drA== X-Google-Smtp-Source: ABdhPJxapVvMKvKH6iTTgSQf1pkBjMYWSZ3Qh/vTwTGqF9XZxcJNTTWkqYTeTnuezByMJ/n+ail1iA== X-Received: by 2002:a1c:bd85:: with SMTP id n127mr4542947wmf.37.1618925826958; Tue, 20 Apr 2021 06:37:06 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id c15sm17705518wrr.3.2021.04.20.06.37.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Apr 2021 06:37:06 -0700 (PDT) From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= To: git@vger.kernel.org Cc: Junio C Hamano , Johannes Schindelin , Jeff King , Taylor Blau , Elijah Newren , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Subject: [PATCH v2 4/8] commit-graph: use obj->type, not object_as_type() Date: Tue, 20 Apr 2021 15:36:56 +0200 Message-Id: X-Mailer: git-send-email 2.31.1.723.ga5d7868e4a In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Change a check of a deref_tag() return value to just use obj->type instead of object_as_type(). The object_as_type() function is for low-level use by fsck, {commit,tree,blob,tag}.c and the like, here we can just assume the object is fully initialized. As can be seen in plenty of existing uses in our codebase the return value of deref_tag() won't be an obj->type == OBJ_NONE or !obj->parsed. Fixes code added in 2f00c355cb7 (commit-graph: drop COMMIT_GRAPH_WRITE_CHECK_OIDS flag, 2020-05-13). Signed-off-by: Ævar Arnfjörð Bjarmason --- builtin/commit-graph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c index cd86315221..347d65abc8 100644 --- a/builtin/commit-graph.c +++ b/builtin/commit-graph.c @@ -158,7 +158,7 @@ static int read_one_commit(struct oidset *commits, struct progress *progress, NULL, 0); if (!result) return error(_("invalid object: %s"), hash); - else if (object_as_type(result, OBJ_COMMIT, 1)) + else if (result->type == OBJ_COMMIT) oidset_insert(commits, &result->oid); display_progress(progress, oidset_size(commits)); -- 2.31.1.723.ga5d7868e4a