From patchwork Tue Dec 29 23:52:57 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: 11992819 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 196B8C433DB for ; Tue, 29 Dec 2020 23:55:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D532621D1B for ; Tue, 29 Dec 2020 23:55:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726230AbgL2XzN (ORCPT ); Tue, 29 Dec 2020 18:55:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60466 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726156AbgL2XzN (ORCPT ); Tue, 29 Dec 2020 18:55:13 -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 7BE5FC06179B for ; Tue, 29 Dec 2020 15:54:32 -0800 (PST) Received: by mail-lf1-x130.google.com with SMTP id y19so34109713lfa.13 for ; Tue, 29 Dec 2020 15:54:32 -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=t1A35HLed5A5wPqE9NzqZfOamyyiAIJ3RW2UbL4pxII=; b=AZsUJpSpPMGZHCRxtWa9JTuk1udxhMzZvU02NeKTkZhId49rcko/WobC4GLolkb0ju IlLcZPQjjhOEsEx54fGBBMSBG4Vkk7HKskTDpPKNIRT9vYwjVatRF1wsNjKiJ+qHqujv sQBJnBQv8OUftbZ4y0Eh4MNHqufgdOZqMNzg0F00BtF0QjPgS42hq4bEL1ZN6oAhCJRG EdWGsnnINVOipWr3cYw2ioRyXjFGLKlsTdJFu4gIvqaIQmi4rahK/3pf93dMW+n6nVps 5G9/8NuCiugWHh7ijqBeccU/n32v6cFdsOPmB9EEXzIaUhdpOyYD4hpg0meSHfpx2Nhz wwcw== 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=t1A35HLed5A5wPqE9NzqZfOamyyiAIJ3RW2UbL4pxII=; b=SD182vqQX/L40W4k/h79K1j3fag9eH01F4s21qrXgOw7MM69FDh1WPoayT8O/+5AYT OlJUJPQJz6uV3yj85HXk0oLCcZXrFh2kkLPKN6T9ZVWHIzId8SavTovK6U6KX+9Em6OV 1gqr7X8nVyLUKJAHmVvYpUCAsEZCTaUJeJ3lo6FXcXRmZe4iad8tBvvoeecDEuatR7Px bljw+BeKG5REHD0NZPAK8qmYJc98KfJjCqISY7Vkwfy6xbPlcvU40PUVO5Sqm5jJwr3Q qiMK7x+blWdKX4Tj+r9K48j8vwSVDlM3UKxeWy4e2EV95AkLO10zfF1H8zqSnsFhPwRc fOGg== X-Gm-Message-State: AOAM530+0swMYGCP+ygC+gabwDPUOkstZjVQlR0swuRge4TycBOulzqV 6wHZP48ZflYKTQ1oHA6d6Mg4T/qsRFk= X-Google-Smtp-Source: ABdhPJz0lnZ84tCFN8CngK/dI8RC+79wFIrayFS3z7x1I/uZs5h+9L7/KknBY1vX4YRdoroOrMxOGQ== X-Received: by 2002:a19:f249:: with SMTP id d9mr13297372lfk.158.1609286070701; Tue, 29 Dec 2020 15:54:30 -0800 (PST) Received: from localhost.localdomain (78-66-223-148-no2204.tbcn.telia.com. [78.66.223.148]) by smtp.gmail.com with ESMTPSA id q25sm5777240lfd.282.2020.12.29.15.54.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Dec 2020 15:54:30 -0800 (PST) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: "brian m. carlson" Subject: [PATCH 1/4] object-name.c: rename from sha1-name.c Date: Wed, 30 Dec 2020 00:52:57 +0100 Message-Id: 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. Signed-off-by: Martin Ågren --- list-objects-filter.c | 2 +- sha1-name.c => object-name.c | 14 +++++++------- Makefile | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) rename sha1-name.c => object-name.c (99%) 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 99% rename from sha1-name.c rename to object-name.c index 0b23b86ceb..7e58a58777 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); } @@ -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 Tue Dec 29 23:52:58 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: 11992821 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 31E12C433E6 for ; Tue, 29 Dec 2020 23:55:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EB9C7221F8 for ; Tue, 29 Dec 2020 23:55:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726261AbgL2XzR (ORCPT ); Tue, 29 Dec 2020 18:55:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726156AbgL2XzR (ORCPT ); Tue, 29 Dec 2020 18:55:17 -0500 Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [IPv6:2a00:1450:4864:20::12b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5DBBC06179C for ; Tue, 29 Dec 2020 15:54:36 -0800 (PST) Received: by mail-lf1-x12b.google.com with SMTP id h205so34238802lfd.5 for ; Tue, 29 Dec 2020 15:54:36 -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=GhrHVEP3I1HBKsvGXuslcLcaHIRYwoJY/ioTGvJc3MU=; b=vW1RuxAAHuOFZljikDxfELg1+uh4B3BFduOxm2CLrPxZjMh24w537JEYOwhme75c7z y8iSdWTW/fM5sdd1NoYkmdaZCiYSGPMU04UThe1ChS72RR0xXIijmioYO0snITbEV64s WrGu0LYy5iQeVhm/wUraAg8AY1FNr2Sxlo23R++hKU0GEWOtql6zobuQhdFTdnrRL9f6 n1yyWBoIF22H8ZJF6RTJbhr7SxnbTF9ZkTFaP9w2NSa8/iwQuB17jwisOkgr4GUSWdIy naz/zjSmMg99zaH+t0TSt/AbqVlBhtDBHfqf9AVnZb9UCA9RDmvL/qmfMsOcv1qpiKCE F2Ag== 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=GhrHVEP3I1HBKsvGXuslcLcaHIRYwoJY/ioTGvJc3MU=; b=jB28pfcoGr9pbSMIYAfhkrCOBx5UDR2gNQX1ct4IysNM6lXiqRiCPl02Rm3MO+oUSO 5QCKGDVKF5fyeJLxzQMo8c8YbKySI7sHEgL62Q8JgxqdrLPPjN5l3GOxa4c4bZIHduj/ FQ2OmyXFnyQI0aAKtqQD7En263WHUQIlXDxP0rF6BIKmKRjcQl8bpQgvMea5YK8PEXLx cCIbzsBRqrp+G4km2pp7JPiy/svnW4wTHZLyZmeIHGMIYPtvg6LWr6osQPSBuMStQXdx f0OVrXG4vGZWBaEMgxgxjY6S/zNZTFnGqHKqA31ZVqWpO1//9MZfqeWWZhfD4jH2thBe bEjg== X-Gm-Message-State: AOAM533Ul1HmpfuCWkNPZB2vH3B0ovYok9UCOGoCGiolq0NT2/QJtBfl bG8SUk4aR4gGY2hv4aNL3Ck2GfEQQlw= X-Google-Smtp-Source: ABdhPJzybLMM+/bYpz+8du0IqwWEjKSkpOFed2RLWvjmZHcj1d/qMWS47PziUN3fgZYjjL8RV3KcZA== X-Received: by 2002:a05:6512:242:: with SMTP id b2mr22950401lfo.460.1609286075154; Tue, 29 Dec 2020 15:54:35 -0800 (PST) Received: from localhost.localdomain (78-66-223-148-no2204.tbcn.telia.com. [78.66.223.148]) by smtp.gmail.com with ESMTPSA id q25sm5777240lfd.282.2020.12.29.15.54.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Dec 2020 15:54:34 -0800 (PST) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: "brian m. carlson" Subject: [PATCH 2/4] object-file.c: rename from sha1-file.c Date: Wed, 30 Dec 2020 00:52:58 +0100 Message-Id: <4243886d8a3df2922fd56fed2a25b2911ec7128c.1609282997.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 | 2 +- Makefile | 2 +- 4 files changed, 4 insertions(+), 4 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..b0c47b02bd 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" 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 Tue Dec 29 23:52:59 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: 11992823 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 444FBC433E9 for ; Tue, 29 Dec 2020 23:55:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 197FD207BB for ; Tue, 29 Dec 2020 23:55:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726285AbgL2XzV (ORCPT ); Tue, 29 Dec 2020 18:55:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60484 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726156AbgL2XzT (ORCPT ); Tue, 29 Dec 2020 18:55:19 -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 B3326C06179E for ; Tue, 29 Dec 2020 15:54:38 -0800 (PST) Received: by mail-lf1-x12d.google.com with SMTP id o17so34276935lfg.4 for ; Tue, 29 Dec 2020 15:54:38 -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=apy/pIbDnDwLSQY2fMGGP9goky6K7ODRCoYl0NhNgtxUyaVsWm+AgWgvTKW2uHCcaY 82pqSjTsgbscJPKcFYOzKPb/Pgx5wKtzyusgePJGkGsFnqLuTRvNZBD7Xx37anVr8GVp E+cnfOrv3QKdIXR6a2whI9FLeSpjIOvCJAlJgxW5lu7KozsCOzjasBxHYGI0cnAhWD4g aXgiyjvkF8cEXjDv/25N3nYP3kuPNPZ39okZG7IcXnTAtT/8a9Ai3n8pOZGG9x0Rcces ZiuBtVpzA/lpChgX9PSG095s4lUEkZjECDhwQQ0tteLTm2py5hlRqOXo8CicRiRTAKrR LeJQ== 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=UTlq+RcXYTb/QqyHxlAbQXwKit3ZL8kyAfUiWIzn6FvwxoGFvb6u2hmBn4pvBM2vaW djlaZnJScDzdt6La9FoqzeZIQG9PyKjdllueepw+ei6zaOOuED6CKm4UFBVznJgrhuTx ymkmS1DF2AdLjE8g89NoHAEX8+ZwaDjJckj3c3vWoGQnfvSS+4brR48m/4aAmVtgNdQw xH3JSd/eHE1imM6A1z5K/60HWhNsVUX3pjhosOnD5zDnS8ciC3hBBnA4iO6RZvRGI983 M84FXOwQfBf53dk3QxDXgbPFgEj++LyP3kznYIbe5lJRyOAzywf5iAwevWgkUhzsU8i8 ifCA== X-Gm-Message-State: AOAM530Fk/3te11PM0QCWL6P9ZiATP0b1ScqM2AwJNqx9vFaKwgGZh+e tW8bGgKh708f2mQbIdmb4LKA349WURA= X-Google-Smtp-Source: ABdhPJwhFHJQs55++eHRXGcBXZ9R62AhU3NHKpTHS7ltIf6PvOGLQPCaG2shxftFbQuiFKSQ8n5YAg== X-Received: by 2002:a2e:2244:: with SMTP id i65mr26515229lji.111.1609286077017; Tue, 29 Dec 2020 15:54:37 -0800 (PST) Received: from localhost.localdomain (78-66-223-148-no2204.tbcn.telia.com. [78.66.223.148]) by smtp.gmail.com with ESMTPSA id q25sm5777240lfd.282.2020.12.29.15.54.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Dec 2020 15:54:36 -0800 (PST) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: "brian m. carlson" Subject: [PATCH 3/4] sha1-lookup: rename `sha1_pos()` as `hash_pos()` Date: Wed, 30 Dec 2020 00:52:59 +0100 Message-Id: <8d3b123633d37218587bb2e71232631dea420156.1609282997.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 Tue Dec 29 23:53:00 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: 11992825 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 26F46C433E0 for ; Tue, 29 Dec 2020 23:55:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E9B4720825 for ; Tue, 29 Dec 2020 23:55:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726305AbgL2XzX (ORCPT ); Tue, 29 Dec 2020 18:55:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60492 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726156AbgL2XzW (ORCPT ); Tue, 29 Dec 2020 18:55:22 -0500 Received: from mail-lf1-x133.google.com (mail-lf1-x133.google.com [IPv6:2a00:1450:4864:20::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 33324C06179F for ; Tue, 29 Dec 2020 15:54:41 -0800 (PST) Received: by mail-lf1-x133.google.com with SMTP id o13so34284562lfr.3 for ; Tue, 29 Dec 2020 15:54:41 -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=x04hAF1LnPBjYXyrCT7VnaPDxI0erCSgqNJbdyKtwiM=; b=UkJuJh/ue/eg1yIEyENbNRr/BFygy06Rb4kmv27zGUEl3r8v03DcQekTtww37NOv/b my9lOpmz8BIkaZzIVvNohd4Rpb89lQyCBvfeX5sDjIEIUrnqQrTIku6y8TCNeyT7+JgG J1ZgEcJoZ8tdEd33RHTU2vNHVe459gZYEmp4wxb5do9EfE5txYVhDryvQ/gAhEe5amA+ avPeWXU3MYzcRHW4BeIJAd7nYQn6lSoinadznxWTZqpX3diu2S8u+XibsdUNoCv0ebe6 X1LHRA4HtzADVgna68XXljgPWzrJS98c0wWYYlpAI+ypKb3Iyb7QMS1uQXeyxY+nhn0z uS+g== 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=x04hAF1LnPBjYXyrCT7VnaPDxI0erCSgqNJbdyKtwiM=; b=WZK1mmBlsXs4Nby/lzyBAfOVm6Rvgni3KXMQehMuT2J3elyTpKvOwIsxVBZWXDv17s 6CCVXMH7zK0iNGEEk/uoi2ewB/Pe46DsZkpT4lKVty4UdGpCe5goHg/MQt1eUEhacxBz vh7SGlNqGFhmi9NJJ2Mwu3RTDuQNEWSEEbIs2GP2DXcleIDfKv8+1wNpBgdQCDEFN6Ia 6D4vlkmynfBWlgWCoQCos6dmL1i3iTZVBgneO+9NdOq0NuE5joixhicThxnx1vvBdOqr tDWZMareVqMsxzM2NFWR1IH+BJC+rQxl6q6FjmGyhe5itu1u+8MuT92mb0IWK98lySwf jOwQ== X-Gm-Message-State: AOAM532dFxCKVg/oNyu0VIdFqhb/7ht73fLhgydCOlZppUjNAu3R1wv7 AqZn91EmEI09lROZjNsVxILCygXc2DM= X-Google-Smtp-Source: ABdhPJy8QuIcD0wE4r6hnFEm5sl4f7qlWO1rgMLfdLHydVHvRpryGRkN/s//ojH79k3j4kO63u5jeQ== X-Received: by 2002:a2e:bc15:: with SMTP id b21mr25727680ljf.350.1609286079442; Tue, 29 Dec 2020 15:54:39 -0800 (PST) Received: from localhost.localdomain (78-66-223-148-no2204.tbcn.telia.com. [78.66.223.148]) by smtp.gmail.com with ESMTPSA id q25sm5777240lfd.282.2020.12.29.15.54.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Dec 2020 15:54:39 -0800 (PST) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: "brian m. carlson" Subject: [PATCH 4/4] hash-lookup: rename from sha1-lookup Date: Wed, 30 Dec 2020 00:53:00 +0100 Message-Id: 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 | 8 ++++---- 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, 23 insertions(+), 23 deletions(-) rename sha1-lookup.h => hash-lookup.h (82%) rename sha1-lookup.c => hash-lookup.c (90%) diff --git a/sha1-lookup.h b/hash-lookup.h similarity index 82% rename from sha1-lookup.h rename to hash-lookup.h index 79973d4785..005795f4a3 100644 --- a/sha1-lookup.h +++ b/hash-lookup.h @@ -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 b0c47b02bd..0f9b81c91a 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