From patchwork Thu Dec 31 11:56:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_=C3=85gren?= X-Patchwork-Id: 11994041 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C97CDC433DB for ; Thu, 31 Dec 2020 11:57:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 98A772246B for ; Thu, 31 Dec 2020 11:57:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726491AbgLaL5U (ORCPT ); Thu, 31 Dec 2020 06:57:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52794 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726155AbgLaL5U (ORCPT ); Thu, 31 Dec 2020 06:57:20 -0500 Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 84029C061575 for ; Thu, 31 Dec 2020 03:56:39 -0800 (PST) Received: by mail-lf1-x132.google.com with SMTP id s26so43576115lfc.8 for ; Thu, 31 Dec 2020 03:56:39 -0800 (PST) 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=z8Kkov9m3OPmk5g7kCEf4JlRj4Zv4yENYlR417N8Up8=; b=C1+I7eHvwcIHXMfqPHXBSlSMjkI+1+mPeakLI0d/GtBoy9pujU8UdLDjQUMBTAMGZH n/sB0gdDzghwzF52NmxRFBRFnx6/oKvhsQKU31m3Z9UdvgXHIq8edq37Uqm9lkgAiJAD iDUAMCb2CGJ7u3EbvyeWcVD+BGDzUb+2/sJZhvD5J8dI6vGYRdYiw9Mj87NsbtXm5ucO y0Mz9JwPw8X/Ox+HnLQvhYw3A2cMnwBAagPTEUwHO26C4B6idEHSSUAyKWaJcb/slaB7 +7tD/rCUCw63bz8WpdlTIqT4yaTD/svV3BjXxWNWxneSgrsJSN5t21UxgniULOF9VfYW q2cg== 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=z8Kkov9m3OPmk5g7kCEf4JlRj4Zv4yENYlR417N8Up8=; b=YEYqyJkGtpCUscJGsij9xAx/JE56376khxOizwU/f+MelOOXGrz1iOeUVDOQcipcRY lzeGw3mpPl2k3O2pmKeUzkM7hcV1pLhojZ26InDGBfZaTkJq4whlAAiX35T7r3pJyhpI lEiKDp0IZHcGfKlxb4ksqfg+ENUADhBaPSp7fsDBdMlHbrXHyP5h+OqfFu44vB/1MJfH ftQbK584D8B3FdLAAUrgaJPVxkg6NvZCVLyxcgb5sDt8jgo9RXiaI6ppVZcops/vxNX0 hiR8dz7AdfJ5fxYcx3+sdwnVhgc4+0D60KUMQmqvv8H9EXmqZo1K5iyRPscRhLe6FPxI LyLg== X-Gm-Message-State: AOAM532bM7zDj9R2t8lT8/SZd0IkMqPA/qPF918iIctnSXIw1VDnWk9j EGpkpc1B3CH4pEg+rvARUK3BOzNQjXE= X-Google-Smtp-Source: ABdhPJwWPO/0nYzhEFSnKsl05xco6fqKI2y5x8gT9ZwrwnxyX8LaW7TdNbIMV376cdvXzd5/MgYm1A== X-Received: by 2002:a05:6512:308c:: with SMTP id z12mr26561645lfd.138.1609415797656; Thu, 31 Dec 2020 03:56:37 -0800 (PST) Received: from localhost.localdomain (host-189-203-5.junet.se. [207.189.203.5]) by smtp.gmail.com with ESMTPSA id m11sm7505329ljp.12.2020.12.31.03.56.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Dec 2020 03:56:37 -0800 (PST) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: "brian m . carlson" , Derrick Stolee Subject: [PATCH v2 1/4] object-name.c: rename from sha1-name.c Date: Thu, 31 Dec 2020 12:56:20 +0100 Message-Id: <4d69d448a3057dfc1a1dcbbd0e4468060e4fde0d.1609415114.git.martin.agren@gmail.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Generalize the last remnants of "sha" and "sha1" in this file and rename it to reflect that we're not just able to handle SHA-1 these days. We need to update one test to check for an updated error string. Signed-off-by: Martin Ågren --- t/t1512-rev-parse-disambiguation.sh | 2 +- list-objects-filter.c | 2 +- sha1-name.c => object-name.c | 16 ++++++++-------- Makefile | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) rename sha1-name.c => object-name.c (98%) diff --git a/t/t1512-rev-parse-disambiguation.sh b/t/t1512-rev-parse-disambiguation.sh index 18fa6cf40d..cc889d7a84 100755 --- a/t/t1512-rev-parse-disambiguation.sh +++ b/t/t1512-rev-parse-disambiguation.sh @@ -48,7 +48,7 @@ test_expect_success 'blob and tree' ' test_expect_success 'warn ambiguity when no candidate matches type hint' ' test_must_fail git rev-parse --verify 000000000^{commit} 2>actual && - test_i18ngrep "short SHA1 000000000 is ambiguous" actual + test_i18ngrep "short object ID 000000000 is ambiguous" actual ' test_expect_success 'disambiguate tree-ish' ' diff --git a/list-objects-filter.c b/list-objects-filter.c index 0a3ef3cab3..4ec0041cfb 100644 --- a/list-objects-filter.c +++ b/list-objects-filter.c @@ -21,7 +21,7 @@ * in the traversal (until we mark it SEEN). This is a way to * let us silently de-dup calls to show() in the caller. This * is subtly different from the "revision.h:SHOWN" and the - * "sha1-name.c:ONELINE_SEEN" bits. And also different from + * "object-name.c:ONELINE_SEEN" bits. And also different from * the non-de-dup usage in pack-bitmap.c */ #define FILTER_SHOWN_BUT_REVISIT (1<<21) diff --git a/sha1-name.c b/object-name.c similarity index 98% rename from sha1-name.c rename to object-name.c index 0b23b86ceb..64202de60b 100644 --- a/sha1-name.c +++ b/object-name.c @@ -85,7 +85,7 @@ static void update_candidates(struct disambiguate_state *ds, const struct object /* otherwise, current can be discarded and candidate is still good */ } -static int match_sha(unsigned, const unsigned char *, const unsigned char *); +static int match_hash(unsigned, const unsigned char *, const unsigned char *); static void find_short_object_filename(struct disambiguate_state *ds) { @@ -102,7 +102,7 @@ static void find_short_object_filename(struct disambiguate_state *ds) while (!ds->ambiguous && pos < loose_objects->nr) { const struct object_id *oid; oid = loose_objects->oid + pos; - if (!match_sha(ds->len, ds->bin_pfx.hash, oid->hash)) + if (!match_hash(ds->len, ds->bin_pfx.hash, oid->hash)) break; update_candidates(ds, oid); pos++; @@ -110,7 +110,7 @@ static void find_short_object_filename(struct disambiguate_state *ds) } } -static int match_sha(unsigned len, const unsigned char *a, const unsigned char *b) +static int match_hash(unsigned len, const unsigned char *a, const unsigned char *b) { do { if (*a != *b) @@ -145,7 +145,7 @@ static void unique_in_midx(struct multi_pack_index *m, for (i = first; i < num && !ds->ambiguous; i++) { struct object_id oid; current = nth_midxed_object_oid(&oid, m, i); - if (!match_sha(ds->len, ds->bin_pfx.hash, current->hash)) + if (!match_hash(ds->len, ds->bin_pfx.hash, current->hash)) break; update_candidates(ds, current); } @@ -173,7 +173,7 @@ static void unique_in_pack(struct packed_git *p, for (i = first; i < num && !ds->ambiguous; i++) { struct object_id oid; nth_packed_object_id(&oid, p, i); - if (!match_sha(ds->len, ds->bin_pfx.hash, oid.hash)) + if (!match_hash(ds->len, ds->bin_pfx.hash, oid.hash)) break; update_candidates(ds, &oid); } @@ -483,7 +483,7 @@ static enum get_oid_result get_short_oid(struct repository *r, if (!quietly && (status == SHORT_NAME_AMBIGUOUS)) { struct oid_array collect = OID_ARRAY_INIT; - error(_("short SHA1 %s is ambiguous"), ds.hex_pfx); + error(_("short object ID %s is ambiguous"), ds.hex_pfx); /* * We may still have ambiguity if we simply saw a series of @@ -1811,7 +1811,7 @@ static enum get_oid_result get_oid_with_context_1(struct repository *repo, if (!ret) return ret; /* - * sha1:path --> object name of path in ent sha1 + * tree:path --> object name of path in tree * :path -> object name of absolute path in index * :./path -> object name of path relative to cwd in index * :[0-3]:path -> object name of path in index at stage @@ -1949,6 +1949,6 @@ enum get_oid_result get_oid_with_context(struct repository *repo, struct object_context *oc) { if (flags & GET_OID_FOLLOW_SYMLINKS && flags & GET_OID_ONLY_TO_DIE) - BUG("incompatible flags for get_sha1_with_context"); + BUG("incompatible flags for get_oid_with_context"); return get_oid_with_context_1(repo, str, flags, NULL, oid, oc); } diff --git a/Makefile b/Makefile index 7b64106930..8bb1163f70 100644 --- a/Makefile +++ b/Makefile @@ -937,6 +937,7 @@ LIB_OBJS += notes-cache.o LIB_OBJS += notes-merge.o LIB_OBJS += notes-utils.o LIB_OBJS += notes.o +LIB_OBJS += object-name.o LIB_OBJS += object.o LIB_OBJS += oid-array.o LIB_OBJS += oidmap.o @@ -995,7 +996,6 @@ LIB_OBJS += server-info.o LIB_OBJS += setup.o LIB_OBJS += sha1-file.o LIB_OBJS += sha1-lookup.o -LIB_OBJS += sha1-name.o LIB_OBJS += shallow.o LIB_OBJS += sideband.o LIB_OBJS += sigchain.o From patchwork Thu Dec 31 11:56:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_=C3=85gren?= X-Patchwork-Id: 11994045 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ED230C433E6 for ; Thu, 31 Dec 2020 11:57:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B044322473 for ; Thu, 31 Dec 2020 11:57:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726520AbgLaL51 (ORCPT ); Thu, 31 Dec 2020 06:57:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52814 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726071AbgLaL50 (ORCPT ); Thu, 31 Dec 2020 06:57:26 -0500 Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C41DC061799 for ; Thu, 31 Dec 2020 03:56:45 -0800 (PST) Received: by mail-lf1-x12a.google.com with SMTP id h205so43612933lfd.5 for ; Thu, 31 Dec 2020 03:56:45 -0800 (PST) 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=2aGz4dIQ4moGrCSgvd3CKn2aam6rHNUkjzCDwMuPOWY=; b=UhX/s3qZgRDGK2mhKio8H7IA+qvaZSvzecpXM2yRJKEAN+W4X8zu7XOnsnLQqkrY3A xN1scrPtlfb339RuXst+gyBhtRuf2sbZE0YJRSl1Ab9ZniSa4pkWWUtbwtuO4csxXvmw PVJxmNr7nx0le0Ks43fGZyUEUXf426/SdzZ087o/9o2497j8br/y1oqPujHJaW/eR1vh JrHJWzfE9Vaj0vvD6H42Y+LrrFK2RNKSQAPG255ze2neT1y/yldADQ9viwGHeUh4PtGG sovRDUTkcaoYnFJ0Ps5FmWxHFsArP6Kgxk5lt6IYfU+v+dHdzuajlKMn5GA4UGVd3Tye gIXQ== 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=2aGz4dIQ4moGrCSgvd3CKn2aam6rHNUkjzCDwMuPOWY=; b=HG22fASwXOjHSxOtMTEX7BbIx10l5zZrLoO6DXz4wfDd5fWSogIIFipBuJyTfZsPvV T4NVB4Va8JyRk8A6xzXmfuFtXojQFXtiFkPkez0xx6+QregQqFXCk18sTPQx4+q82GSh WVeI9O7BplhBfxLT42mfO2GEIv988+NhSk8FFBuZ9k2dAu7YCTb/qK9rSwj9aiYnCUgg jSj4DoT/cg9sRdyXnVkTVXemHvZDAUbkHZ/rEwu8HOk85Sutvi321qtV6WsNrVweDLEa VcrWkrbWcbL6k7j4rCxj7g/uiO51laSGfczRqsWozCaNAaq/2IXqkIu6PgChb8U4YQna ZYIA== X-Gm-Message-State: AOAM533Rh3Pjwvze4E2p+aZkoJ4X9NKN86vqusOJpXMbdJFlBkFBf57S /ke7b7fXuQTD1xFNNiIWC3zZcn+Mzf4= X-Google-Smtp-Source: ABdhPJzyxPlTQz0I5+n72aS+5jX7is0+TjRRgloGG5T10LQzTR0vBGnbHQkkJXon8FiFbdIKpD83+A== X-Received: by 2002:a05:6512:22cd:: with SMTP id g13mr16064482lfu.368.1609415803696; Thu, 31 Dec 2020 03:56:43 -0800 (PST) Received: from localhost.localdomain (host-189-203-5.junet.se. [207.189.203.5]) by smtp.gmail.com with ESMTPSA id m11sm7505329ljp.12.2020.12.31.03.56.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Dec 2020 03:56:43 -0800 (PST) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: "brian m . carlson" , Derrick Stolee Subject: [PATCH v2 2/4] object-file.c: rename from sha1-file.c Date: Thu, 31 Dec 2020 12:56:21 +0100 Message-Id: <7ab29b868f3980d1bf20fe21db5213b43e06c00b.1609415114.git.martin.agren@gmail.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Drop the last remnant of "sha1" in this file and rename it to reflect that we're not just able to handle SHA-1 these days. Signed-off-by: Martin Ågren --- t/oid-info/README | 2 +- builtin/index-pack.c | 2 +- sha1-file.c => object-file.c | 8 ++++---- Makefile | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) rename sha1-file.c => object-file.c (99%) diff --git a/t/oid-info/README b/t/oid-info/README index 27f843fc00..ca56a74b1e 100644 --- a/t/oid-info/README +++ b/t/oid-info/README @@ -5,7 +5,7 @@ starting with `#` are ignored. The key and value are separated by whitespace (specifically, those whitespace in the default `$IFS`). The key consists only of shell identifier characters, and the value consists of a hash algorithm, colon, and value. The hash algorithm also consists only of shell identifier -characters; it should match the value in sha1-file.c. +characters; it should match the value in object-file.c. For example, the following lines map the key "rawsz" to "20" if SHA-1 is in use and to "32" if SHA-256 is in use: diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 4b8d86e0ad..557bd2f348 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -1641,7 +1641,7 @@ static void read_idx_option(struct pack_idx_option *opts, const char *pack_name) /* * Get rid of the idx file as we do not need it anymore. * NEEDSWORK: extract this bit from free_pack_by_name() in - * sha1-file.c, perhaps? It shouldn't matter very much as we + * object-file.c, perhaps? It shouldn't matter very much as we * know we haven't installed this pack (hence we never have * read anything from it). */ diff --git a/sha1-file.c b/object-file.c similarity index 99% rename from sha1-file.c rename to object-file.c index c3c49d2fa5..3508598d97 100644 --- a/sha1-file.c +++ b/object-file.c @@ -3,7 +3,7 @@ * * Copyright (C) Linus Torvalds, 2005 * - * This handles basic git sha1 object files - packing, unpacking, + * This handles basic git object files - packing, unpacking, * creation etc. */ #include "cache.h" @@ -508,9 +508,9 @@ static int alt_odb_usable(struct raw_object_store *o, * LF separated. Its base points at a statically allocated buffer that * contains "/the/directory/corresponding/to/.git/objects/...", while * its name points just after the slash at the end of ".git/objects/" - * in the example above, and has enough space to hold 40-byte hex - * SHA1, an extra slash for the first level indirection, and the - * terminating NUL. + * in the example above, and has enough space to hold all hex characters + * of the object ID, an extra slash for the first level indirection, and + * the terminating NUL. */ static void read_info_alternates(struct repository *r, const char *relative_base, diff --git a/Makefile b/Makefile index 8bb1163f70..224a1c6940 100644 --- a/Makefile +++ b/Makefile @@ -937,6 +937,7 @@ LIB_OBJS += notes-cache.o LIB_OBJS += notes-merge.o LIB_OBJS += notes-utils.o LIB_OBJS += notes.o +LIB_OBJS += object-file.o LIB_OBJS += object-name.o LIB_OBJS += object.o LIB_OBJS += oid-array.o @@ -994,7 +995,6 @@ LIB_OBJS += sequencer.o LIB_OBJS += serve.o LIB_OBJS += server-info.o LIB_OBJS += setup.o -LIB_OBJS += sha1-file.o LIB_OBJS += sha1-lookup.o LIB_OBJS += shallow.o LIB_OBJS += sideband.o From patchwork Thu Dec 31 11:56:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_=C3=85gren?= X-Patchwork-Id: 11994043 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 13336C433E9 for ; Thu, 31 Dec 2020 11:57:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D3BBB2242A for ; Thu, 31 Dec 2020 11:57:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726539AbgLaL52 (ORCPT ); Thu, 31 Dec 2020 06:57:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726071AbgLaL51 (ORCPT ); Thu, 31 Dec 2020 06:57:27 -0500 Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6AD3BC06179B for ; Thu, 31 Dec 2020 03:56:46 -0800 (PST) Received: by mail-lf1-x130.google.com with SMTP id a12so43640896lfl.6 for ; Thu, 31 Dec 2020 03:56:46 -0800 (PST) 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=+5zVxCKNU0XKxztAJfIs6Z3+5g0jvrMJaBGwrXuObjo=; b=n0QnejDtU2UqyOkhCnvdxS2rukqTu//gnvjft1Fvhbb0dk4NF+DOkG+PZ+p+V2ZJvk +RdjgSBfoSRcPHnsb+avEA9a71jUWgQqoHGV7jQ2QH8vjHGPuki/jimxAHjocnxLMlkW D58oIg2mY3p5EhP6IXqt06KBdBkXqqsr3HD7fStO2Jpiv09ojwE0dEv7EMOcWZm3gasq vG39z4aulLRrSOwgc7XTOZ7yrH3IwSiGa4p0Cf2m+fzdyDaKnoyQrS2RtzXoSnZqBR2q pO4ww9w0YzMjV1SYymlb7QdyjNP07VDXYklPXGgB1ki/Io4aaPs3ds8sgfWbPkM9Q8sv TSOQ== 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=+5zVxCKNU0XKxztAJfIs6Z3+5g0jvrMJaBGwrXuObjo=; b=aF3NpDcXFH/7oYgoQuu5pRLurdbV7HSbTaQHA31Kvjo+zh6RXrqLIc97rfIE3m7flx 4xlbPfa3gjmM6t3kP+6ydNRiiNbseXGZC7t6ZlhcFzPJa143feg8ny81GDGRhzjdWLOR db9ezWyZme6lXjl/WWCgs+Lg5gtG38g3GRF+NwmXvGgE/oAZJLNVnyh3S6pT0BuUY0gG IjhjNuYh4H4ExUwOYF0HeQ9mo0SbtDjRpOD5uJb4p3H3i+2hjYh3PKYmQoCudUi9vK4j f+8JsmNJD3eOaXwDP54IOkPIOnK6WLvT/l3jQGdfYkiwCsAAR+H2HiXr/kLmW9Lj5v4n 8DPQ== X-Gm-Message-State: AOAM530K/wIFxkohOEZHROua+pd7XTxtAwhyp8AUlrgyM3v97qVb70JL cYMsg8xQMMk/dHZT0w9Y/Yf/n2ewmNU= X-Google-Smtp-Source: ABdhPJxQbAZNRHYv/K3aY2XUJS4tP4RIGVD7wwuQu/Eo1VhE6oarV3e2STQ2Fdr65fchD0NyQIpoNg== X-Received: by 2002:a19:4841:: with SMTP id v62mr21592386lfa.607.1609415804600; Thu, 31 Dec 2020 03:56:44 -0800 (PST) Received: from localhost.localdomain (host-189-203-5.junet.se. [207.189.203.5]) by smtp.gmail.com with ESMTPSA id m11sm7505329ljp.12.2020.12.31.03.56.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Dec 2020 03:56:44 -0800 (PST) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: "brian m . carlson" , Derrick Stolee Subject: [PATCH v2 3/4] sha1-lookup: rename `sha1_pos()` as `hash_pos()` Date: Thu, 31 Dec 2020 12:56:22 +0100 Message-Id: <91617de0acfca8d944d5ed75c84b5cd3597f776f.1609415114.git.martin.agren@gmail.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Rename this function to reflect that we're not just able to handle SHA-1 these days. There are a few instances of "sha1" left in sha1-lookup.[ch] after this, but those will be addressed in the next commit. Signed-off-by: Martin Ågren --- sha1-lookup.h | 6 +++--- builtin/name-rev.c | 2 +- commit-graph.c | 6 +++--- commit.c | 2 +- oid-array.c | 2 +- pack-bitmap-write.c | 2 +- rerere.c | 2 +- sha1-lookup.c | 8 ++++---- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/sha1-lookup.h b/sha1-lookup.h index 5afcd011c6..79973d4785 100644 --- a/sha1-lookup.h +++ b/sha1-lookup.h @@ -1,12 +1,12 @@ #ifndef SHA1_LOOKUP_H #define SHA1_LOOKUP_H -typedef const unsigned char *sha1_access_fn(size_t index, void *table); +typedef const unsigned char *hash_access_fn(size_t index, void *table); -int sha1_pos(const unsigned char *sha1, +int hash_pos(const unsigned char *hash, void *table, size_t nr, - sha1_access_fn fn); + hash_access_fn fn); /* * Searches for sha1 in table, using the given fanout table to determine the diff --git a/builtin/name-rev.c b/builtin/name-rev.c index 725dd04519..4939ceb2e5 100644 --- a/builtin/name-rev.c +++ b/builtin/name-rev.c @@ -408,7 +408,7 @@ static const char *get_exact_ref_match(const struct object *o) tip_table.sorted = 1; } - found = sha1_pos(o->oid.hash, tip_table.table, tip_table.nr, + found = hash_pos(o->oid.hash, tip_table.table, tip_table.nr, nth_tip_table_ent); if (0 <= found) return tip_table.table[found].refname; diff --git a/commit-graph.c b/commit-graph.c index 06f8dc1d89..c672feee91 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -1043,7 +1043,7 @@ static int write_graph_chunk_data(struct hashfile *f, if (!parent) edge_value = GRAPH_PARENT_NONE; else { - edge_value = sha1_pos(parent->item->object.oid.hash, + edge_value = hash_pos(parent->item->object.oid.hash, ctx->commits.list, ctx->commits.nr, commit_to_sha1); @@ -1074,7 +1074,7 @@ static int write_graph_chunk_data(struct hashfile *f, else if (parent->next) edge_value = GRAPH_EXTRA_EDGES_NEEDED | num_extra_edges; else { - edge_value = sha1_pos(parent->item->object.oid.hash, + edge_value = hash_pos(parent->item->object.oid.hash, ctx->commits.list, ctx->commits.nr, commit_to_sha1); @@ -1143,7 +1143,7 @@ static int write_graph_chunk_extra_edges(struct hashfile *f, /* Since num_parents > 2, this initializer is safe. */ for (parent = (*list)->parents->next; parent; parent = parent->next) { - int edge_value = sha1_pos(parent->item->object.oid.hash, + int edge_value = hash_pos(parent->item->object.oid.hash, ctx->commits.list, ctx->commits.nr, commit_to_sha1); diff --git a/commit.c b/commit.c index fe1fa3dc41..0b7bace022 100644 --- a/commit.c +++ b/commit.c @@ -113,7 +113,7 @@ static const unsigned char *commit_graft_sha1_access(size_t index, void *table) int commit_graft_pos(struct repository *r, const unsigned char *sha1) { - return sha1_pos(sha1, r->parsed_objects->grafts, + return hash_pos(sha1, r->parsed_objects->grafts, r->parsed_objects->grafts_nr, commit_graft_sha1_access); } diff --git a/oid-array.c b/oid-array.c index 8e1bcedc0c..fb4c3dd795 100644 --- a/oid-array.c +++ b/oid-array.c @@ -31,7 +31,7 @@ static const unsigned char *sha1_access(size_t index, void *table) int oid_array_lookup(struct oid_array *array, const struct object_id *oid) { oid_array_sort(array); - return sha1_pos(oid->hash, array->oid, array->nr, sha1_access); + return hash_pos(oid->hash, array->oid, array->nr, sha1_access); } void oid_array_clear(struct oid_array *array) diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c index 5e998bdaa7..27ece05ec7 100644 --- a/pack-bitmap-write.c +++ b/pack-bitmap-write.c @@ -482,7 +482,7 @@ static void write_selected_commits_v1(struct hashfile *f, struct bitmapped_commit *stored = &writer.selected[i]; int commit_pos = - sha1_pos(stored->commit->object.oid.hash, index, index_nr, sha1_access); + hash_pos(stored->commit->object.oid.hash, index, index_nr, sha1_access); if (commit_pos < 0) BUG("trying to write commit not in index"); diff --git a/rerere.c b/rerere.c index 9281131a9f..9fc76eb756 100644 --- a/rerere.c +++ b/rerere.c @@ -147,7 +147,7 @@ static struct rerere_dir *find_rerere_dir(const char *hex) if (get_sha1_hex(hex, hash)) return NULL; /* BUG */ - pos = sha1_pos(hash, rerere_dir, rerere_dir_nr, rerere_dir_hash); + pos = hash_pos(hash, rerere_dir, rerere_dir_nr, rerere_dir_hash); if (pos < 0) { rr_dir = xmalloc(sizeof(*rr_dir)); hashcpy(rr_dir->hash, hash); diff --git a/sha1-lookup.c b/sha1-lookup.c index 29185844ec..45489edfe8 100644 --- a/sha1-lookup.c +++ b/sha1-lookup.c @@ -47,11 +47,11 @@ static uint32_t take2(const unsigned char *sha1) */ /* * The table should contain "nr" elements. - * The sha1 of element i (between 0 and nr - 1) should be returned + * The hash of element i (between 0 and nr - 1) should be returned * by "fn(i, table)". */ -int sha1_pos(const unsigned char *hash, void *table, size_t nr, - sha1_access_fn fn) +int hash_pos(const unsigned char *hash, void *table, size_t nr, + hash_access_fn fn) { size_t hi = nr; size_t lo = 0; @@ -74,7 +74,7 @@ int sha1_pos(const unsigned char *hash, void *table, size_t nr, if (lov != hiv) { /* * At this point miv could be equal - * to hiv (but sha1 could still be higher); + * to hiv (but hash could still be higher); * the invariant of (mi < hi) should be * kept. */ From patchwork Thu Dec 31 11:56:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_=C3=85gren?= X-Patchwork-Id: 11994047 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 19965C4332B for ; Thu, 31 Dec 2020 11:57:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EE6142247F for ; Thu, 31 Dec 2020 11:57:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726555AbgLaL53 (ORCPT ); Thu, 31 Dec 2020 06:57:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726071AbgLaL52 (ORCPT ); Thu, 31 Dec 2020 06:57:28 -0500 Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AB5FCC06179C for ; Thu, 31 Dec 2020 03:56:47 -0800 (PST) Received: by mail-lf1-x12d.google.com with SMTP id m12so43604271lfo.7 for ; Thu, 31 Dec 2020 03:56:47 -0800 (PST) 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=tkvHtO+h1DEcIhtrJ/BtUTKPCLHlKkFY51LIHpAur3M=; b=Zo6gvX3cTHn03dgDkkI0bG6mcKiShQoR6jzReAKrGWprFTtsQluj9PXFtcXPobPH97 k24f5DyT+Hqca6ZWj/yYGEbAuainMCc1OiMBr9RYDjhfqagTnUfAlM8jbIp0joYAKgjd ocmS910afwXtxL22lecNFSXBU9ON1J8XIZF1b1jciNCiQSL2xawQeY0FbUXh3uDHDIMs yqEviwA08J3QY7VZgVe5eqPFVSrQXLzKQbW0huEs7RXwH++hZzKrIbwuyoI5KaS6vzUI Tiv7M6TuvaKlY5GjXeXKaSmgT07XIMMqx2Hp5JEAf2XqrnDaaF1eSKyCEsL2HfRCEkkU hWYw== 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=tkvHtO+h1DEcIhtrJ/BtUTKPCLHlKkFY51LIHpAur3M=; b=WwuQxQq4Y7ogy4knUbtNkqYiNcCxNCUQJXRmVTvYXfACu17eoqfhOIfqN2wr0ruQqj 9DOTG4XjvKuLWLqzruqZ91QWiBO+9+1sIre1FOdmocjy1JYBGJslsCJOC7frFLYWcz8J +SIivlc8cPKncjKzHPEW9m+DFGWmSeBxK1ppl9FM09s8tnLP3RNIdcjelg8RS2DI6xt1 Oi56PkozJmrQ2pvyXq8uCOMpsXs0DLh6RmIuG2gJAMHV3Lt/pcqhwm82MY+99jFauLEQ wQXku7fXsnxSXUZGEPc+KJIihnl3G0o7Dh4iNOtq4yEsXsGCkLvjLjJwQFtXXLq3z1bX KdAg== X-Gm-Message-State: AOAM533YfZh/5YQJEcWhY9JfLxMuR1+rAvCC843DLJqoi+0srKQRV2cd eYi7hrVmFecDTxW+7/vHlcWZaaYZdTQ= X-Google-Smtp-Source: ABdhPJzY9DYLfKBXC17erqnXfoVaz4DKUeMediLhrZkKW9pCl7tT5XxTnY//AfaphW8fWNPQZtXTwQ== X-Received: by 2002:a05:651c:542:: with SMTP id q2mr29380962ljp.19.1609415805873; Thu, 31 Dec 2020 03:56:45 -0800 (PST) Received: from localhost.localdomain (host-189-203-5.junet.se. [207.189.203.5]) by smtp.gmail.com with ESMTPSA id m11sm7505329ljp.12.2020.12.31.03.56.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Dec 2020 03:56:45 -0800 (PST) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: "brian m . carlson" , Derrick Stolee Subject: [PATCH v2 4/4] hash-lookup: rename from sha1-lookup Date: Thu, 31 Dec 2020 12:56:23 +0100 Message-Id: <9df53353dc455e6d776bea9a468207ddb44d5a0f.1609415114.git.martin.agren@gmail.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Change all remnants of "sha1" in hash-lookup.c and .h and rename them to reflect that we're not just able to handle SHA-1 these days. Signed-off-by: Martin Ågren --- sha1-lookup.h => hash-lookup.h | 12 ++++++------ bisect.c | 2 +- builtin/name-rev.c | 2 +- commit-graph.c | 2 +- commit.c | 2 +- sha1-lookup.c => hash-lookup.c | 14 +++++++------- midx.c | 2 +- object-file.c | 2 +- oid-array.c | 2 +- pack-bitmap-write.c | 2 +- packfile.c | 2 +- patch-ids.c | 2 +- rerere.c | 2 +- Makefile | 2 +- 14 files changed, 25 insertions(+), 25 deletions(-) rename sha1-lookup.h => hash-lookup.h (78%) rename sha1-lookup.c => hash-lookup.c (90%) diff --git a/sha1-lookup.h b/hash-lookup.h similarity index 78% rename from sha1-lookup.h rename to hash-lookup.h index 79973d4785..5d476dec72 100644 --- a/sha1-lookup.h +++ b/hash-lookup.h @@ -1,5 +1,5 @@ -#ifndef SHA1_LOOKUP_H -#define SHA1_LOOKUP_H +#ifndef HASH_LOOKUP_H +#define HASH_LOOKUP_H typedef const unsigned char *hash_access_fn(size_t index, void *table); @@ -9,12 +9,12 @@ int hash_pos(const unsigned char *hash, hash_access_fn fn); /* - * Searches for sha1 in table, using the given fanout table to determine the + * Searches for hash in table, using the given fanout table to determine the * interval to search, then using binary search. Returns 1 if found, 0 if not. * * Takes the following parameters: * - * - sha1: the hash to search for + * - hash: the hash to search for * - fanout_nbo: a 256-element array of NETWORK-order 32-bit integers; the * integer at position i represents the number of elements in table whose * first byte is less than or equal to i @@ -23,10 +23,10 @@ int hash_pos(const unsigned char *hash, * GIT_MAX_RAWSZ or greater) * - result: if not NULL, this function stores the element index of the * position found (if the search is successful) or the index of the least - * element that is greater than sha1 (if the search is not successful) + * element that is greater than hash (if the search is not successful) * * This function does not verify the validity of the fanout table. */ -int bsearch_hash(const unsigned char *sha1, const uint32_t *fanout_nbo, +int bsearch_hash(const unsigned char *hash, const uint32_t *fanout_nbo, const unsigned char *table, size_t stride, uint32_t *result); #endif diff --git a/bisect.c b/bisect.c index d8c2c8f7a7..75ea0eb57f 100644 --- a/bisect.c +++ b/bisect.c @@ -6,7 +6,7 @@ #include "refs.h" #include "list-objects.h" #include "quote.h" -#include "sha1-lookup.h" +#include "hash-lookup.h" #include "run-command.h" #include "log-tree.h" #include "bisect.h" diff --git a/builtin/name-rev.c b/builtin/name-rev.c index 4939ceb2e5..3fe71a8c01 100644 --- a/builtin/name-rev.c +++ b/builtin/name-rev.c @@ -7,7 +7,7 @@ #include "refs.h" #include "parse-options.h" #include "prio-queue.h" -#include "sha1-lookup.h" +#include "hash-lookup.h" #include "commit-slab.h" /* diff --git a/commit-graph.c b/commit-graph.c index c672feee91..e9124d4a41 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -7,7 +7,7 @@ #include "object.h" #include "refs.h" #include "revision.h" -#include "sha1-lookup.h" +#include "hash-lookup.h" #include "commit-graph.h" #include "object-store.h" #include "alloc.h" diff --git a/commit.c b/commit.c index 0b7bace022..cb119ebdf2 100644 --- a/commit.c +++ b/commit.c @@ -14,7 +14,7 @@ #include "mergesort.h" #include "commit-slab.h" #include "prio-queue.h" -#include "sha1-lookup.h" +#include "hash-lookup.h" #include "wt-status.h" #include "advice.h" #include "refs.h" diff --git a/sha1-lookup.c b/hash-lookup.c similarity index 90% rename from sha1-lookup.c rename to hash-lookup.c index 45489edfe8..1191856a32 100644 --- a/sha1-lookup.c +++ b/hash-lookup.c @@ -1,9 +1,9 @@ #include "cache.h" -#include "sha1-lookup.h" +#include "hash-lookup.h" -static uint32_t take2(const unsigned char *sha1) +static uint32_t take2(const unsigned char *hash) { - return ((sha1[0] << 8) | sha1[1]); + return ((hash[0] << 8) | hash[1]); } /* @@ -100,17 +100,17 @@ int hash_pos(const unsigned char *hash, void *table, size_t nr, return index_pos_to_insert_pos(lo); } -int bsearch_hash(const unsigned char *sha1, const uint32_t *fanout_nbo, +int bsearch_hash(const unsigned char *hash, const uint32_t *fanout_nbo, const unsigned char *table, size_t stride, uint32_t *result) { uint32_t hi, lo; - hi = ntohl(fanout_nbo[*sha1]); - lo = ((*sha1 == 0x0) ? 0 : ntohl(fanout_nbo[*sha1 - 1])); + hi = ntohl(fanout_nbo[*hash]); + lo = ((*hash == 0x0) ? 0 : ntohl(fanout_nbo[*hash - 1])); while (lo < hi) { unsigned mi = lo + (hi - lo) / 2; - int cmp = hashcmp(table + mi * stride, sha1); + int cmp = hashcmp(table + mi * stride, hash); if (!cmp) { if (result) diff --git a/midx.c b/midx.c index 79c282b070..f9d9b832bb 100644 --- a/midx.c +++ b/midx.c @@ -5,7 +5,7 @@ #include "lockfile.h" #include "packfile.h" #include "object-store.h" -#include "sha1-lookup.h" +#include "hash-lookup.h" #include "midx.h" #include "progress.h" #include "trace2.h" diff --git a/object-file.c b/object-file.c index 3508598d97..5bcfde8471 100644 --- a/object-file.c +++ b/object-file.c @@ -20,7 +20,7 @@ #include "tree-walk.h" #include "refs.h" #include "pack-revindex.h" -#include "sha1-lookup.h" +#include "hash-lookup.h" #include "bulk-checkin.h" #include "repository.h" #include "replace-object.h" diff --git a/oid-array.c b/oid-array.c index fb4c3dd795..889b311f22 100644 --- a/oid-array.c +++ b/oid-array.c @@ -1,6 +1,6 @@ #include "cache.h" #include "oid-array.h" -#include "sha1-lookup.h" +#include "hash-lookup.h" void oid_array_append(struct oid_array *array, const struct object_id *oid) { diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c index 27ece05ec7..ae6d1475f9 100644 --- a/pack-bitmap-write.c +++ b/pack-bitmap-write.c @@ -9,7 +9,7 @@ #include "pack-revindex.h" #include "pack.h" #include "pack-bitmap.h" -#include "sha1-lookup.h" +#include "hash-lookup.h" #include "pack-objects.h" #include "commit-reach.h" diff --git a/packfile.c b/packfile.c index 86f5c8dbf6..62d92e0c7c 100644 --- a/packfile.c +++ b/packfile.c @@ -7,7 +7,7 @@ #include "packfile.h" #include "delta.h" #include "streaming.h" -#include "sha1-lookup.h" +#include "hash-lookup.h" #include "commit.h" #include "object.h" #include "tag.h" diff --git a/patch-ids.c b/patch-ids.c index 21973e4933..cf5e8045b7 100644 --- a/patch-ids.c +++ b/patch-ids.c @@ -1,7 +1,7 @@ #include "cache.h" #include "diff.h" #include "commit.h" -#include "sha1-lookup.h" +#include "hash-lookup.h" #include "patch-ids.h" static int patch_id_defined(struct commit *commit) diff --git a/rerere.c b/rerere.c index 9fc76eb756..d6928c1b5c 100644 --- a/rerere.c +++ b/rerere.c @@ -10,7 +10,7 @@ #include "attr.h" #include "pathspec.h" #include "object-store.h" -#include "sha1-lookup.h" +#include "hash-lookup.h" #define RESOLVED 0 #define PUNTED 1 diff --git a/Makefile b/Makefile index 224a1c6940..7a141facc7 100644 --- a/Makefile +++ b/Makefile @@ -901,6 +901,7 @@ LIB_OBJS += gettext.o LIB_OBJS += gpg-interface.o LIB_OBJS += graph.o LIB_OBJS += grep.o +LIB_OBJS += hash-lookup.o LIB_OBJS += hashmap.o LIB_OBJS += help.o LIB_OBJS += hex.o @@ -995,7 +996,6 @@ LIB_OBJS += sequencer.o LIB_OBJS += serve.o LIB_OBJS += server-info.o LIB_OBJS += setup.o -LIB_OBJS += sha1-lookup.o LIB_OBJS += shallow.o LIB_OBJS += sideband.o LIB_OBJS += sigchain.o