[01/26] builtin/replace: make hash size independent

Message ID	20190818200427.870753-2-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 01/26] builtin/replace: make hash size independent Date: Sun, 18 Aug 2019 20:04:02 +0000 Message-Id: <20190818200427.870753-2-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-2-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 01/26] builtin/replace: make hash size independent
Date: Sun, 18 Aug 2019 20:04:02 +0000
Message-Id: <20190818200427.870753-2-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

Instead of using GIT_SHA1_HEXSZ and hard-coded constants, switch to
using the_hash_algo.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
 builtin/replace.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/builtin/replace.c b/builtin/replace.c
index 644b21ca8d..4b00f1d84e 100644
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -272,7 +272,7 @@  static int import_object(struct object_id *oid, enum object_type type,
 			return error(_("unable to spawn mktree"));
 		}
 
-		if (strbuf_read(&result, cmd.out, 41) < 0) {
+		if (strbuf_read(&result, cmd.out, the_hash_algo->hexsz + 1) < 0) {
 			error_errno(_("unable to read from mktree"));
 			close(fd);
 			close(cmd.out);
@@ -358,14 +358,15 @@  static int replace_parents(struct strbuf *buf, int argc, const char **argv)
 	struct strbuf new_parents = STRBUF_INIT;
 	const char *parent_start, *parent_end;
 	int i;
+	const unsigned hexsz = the_hash_algo->hexsz;
 
 	/* find existing parents */
 	parent_start = buf->buf;
-	parent_start += GIT_SHA1_HEXSZ + 6; /* "tree " + "hex sha1" + "\n" */
+	parent_start += hexsz + 6; /* "tree " + "hex sha1" + "\n" */
 	parent_end = parent_start;
 
 	while (starts_with(parent_end, "parent "))
-		parent_end += 48; /* "parent " + "hex sha1" + "\n" */
+		parent_end += hexsz + 8; /* "parent " + "hex sha1" + "\n" */
 
 	/* prepare new parents */
 	for (i = 0; i < argc; i++) {

[01/26] builtin/replace: make hash size independent

Commit Message

Patch