[25/26] builtin/show-index: replace sha1_to_hex

Message ID	20190818200427.870753-26-sandals@crustytoothpaste.net (mailing list archive)
State	New, archived
Headers	show Return-Path: <git-owner@kernel.org> From: "brian m. carlson" <sandals@crustytoothpaste.net> To: <git@vger.kernel.org> Cc: Taylor Blau <me@ttaylorr.com>, Derrick Stolee <dstolee@microsoft.com> Subject: [PATCH 25/26] builtin/show-index: replace sha1_to_hex Date: Sun, 18 Aug 2019 20:04:26 +0000 Message-Id: <20190818200427.870753-26-sandals@crustytoothpaste.net> In-Reply-To: <20190818200427.870753-1-sandals@crustytoothpaste.net> References: <20190818200427.870753-1-sandals@crustytoothpaste.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk
Series	object_id part 17 \| expand [00/26] object_id part 17 [01/26] builtin/replace: make hash size independent [02/26] patch-id: convert to use the_hash_algo [03/26] fetch-pack: use parse_oid_hex [04/26] builtin/receive-pack: switch to use the_hash_algo [05/26] builtin/blame: switch uses of GIT_SHA1_HEXSZ to the_hash_algo [06/26] builtin/rev-parse: switch to use the_hash_algo [07/26] blame: remove needless comparison with GIT_SHA1_HEXSZ [08/26] show-index: switch hard-coded constants to the_hash_algo [09/26] connected: switch GIT_SHA1_HEXSZ to the_hash_algo [10/26] bundle: switch to use the_hash_algo [11/26] combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo [12/26] config: use the_hash_algo in abbrev comparison [13/26] sha1-lookup: switch hard-coded constants to the_hash_algo [14/26] bisect: switch to using the_hash_algo [15/26] sequencer: convert to use the_hash_algo [16/26] pack-write: use hash_to_hex when writing checksums [17/26] builtin/repack: write object IDs of the proper length [18/26] builtin/worktree: switch null_sha1 to null_oid [19/26] cache: remove null_sha1 [20/26] wt-status: convert struct wt_status to object_id [21/26] packfile: replace sha1_to_hex [22/26] builtin/index-pack: replace sha1_to_hex [23/26] builtin/receive-pack: replace sha1_to_hex [24/26] rerere: replace sha1_to_hex [25/26] builtin/show-index: replace sha1_to_hex [26/26] midx: switch to using the_hash_algo

Message ID

20190818200427.870753-26-sandals@crustytoothpaste.net (mailing list archive)

State

New, archived

Headers

From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: <git@vger.kernel.org>
Cc: Taylor Blau <me@ttaylorr.com>,
        Derrick Stolee <dstolee@microsoft.com>
Subject: [PATCH 25/26] builtin/show-index: replace sha1_to_hex
Date: Sun, 18 Aug 2019 20:04:26 +0000
Message-Id: <20190818200427.870753-26-sandals@crustytoothpaste.net>
In-Reply-To: <20190818200427.870753-1-sandals@crustytoothpaste.net>
References: <20190818200427.870753-1-sandals@crustytoothpaste.net>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: git-owner@vger.kernel.org
Precedence: bulk

Series

object_id part 17 | expand

Commit Message

brian m. carlson Aug. 18, 2019, 8:04 p.m. UTC

In this code path, we use sha1_to_hex to display the contents of a v1
pack index.  While we plan to switch to v3 indices for SHA-256, the v1
pack indices still function, so to support both algorithms, switch
sha1_to_hex to hash_to_hex.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
 builtin/show-index.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builtin/show-index.c b/builtin/show-index.c
index e95b84e8eb..0826f6a5a2 100644
--- a/builtin/show-index.c
+++ b/builtin/show-index.c
@@ -42,7 +42,7 @@  int cmd_show_index(int argc, const char **argv, const char *prefix)
 			if (fread(entry, 4 + hashsz, 1, stdin) != 1)
 				die("unable to read entry %u/%u", i, nr);
 			offset = ntohl(entry[0]);
-			printf("%u %s\n", offset, sha1_to_hex((void *)(entry+1)));
+			printf("%u %s\n", offset, hash_to_hex((void *)(entry+1)));
 		}
 	} else {
 		unsigned off64_nr = 0;

[25/26] builtin/show-index: replace sha1_to_hex

Commit Message

Patch