[15/26] sequencer: convert to use the_hash_algo

Message ID	20190818200427.870753-16-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 15/26] sequencer: convert to use the_hash_algo Date: Sun, 18 Aug 2019 20:04:16 +0000 Message-Id: <20190818200427.870753-16-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-16-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 15/26] sequencer: convert to use the_hash_algo
Date: Sun, 18 Aug 2019 20:04:16 +0000
Message-Id: <20190818200427.870753-16-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

Convert several uses of GIT_SHA1_HEXSZ constants to be references to
the_hash_algo.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
 sequencer.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sequencer.c b/sequencer.c
index 34ebf8ed94..4d25e79137 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -3568,7 +3568,7 @@  static int do_merge(struct repository *r,
 		goto leave_merge;
 	}
 
-	write_message(oid_to_hex(&merge_commit->object.oid), GIT_SHA1_HEXSZ,
+	write_message(oid_to_hex(&merge_commit->object.oid), the_hash_algo->hexsz,
 		      git_path_merge_head(r), 0);
 	write_message("no-ff", 5, git_path_merge_mode(r), 0);
 
@@ -4487,7 +4487,7 @@  static const char *label_oid(struct object_id *oid, const char *label,
 		char *p;
 
 		strbuf_reset(&state->buf);
-		strbuf_grow(&state->buf, GIT_SHA1_HEXSZ);
+		strbuf_grow(&state->buf, GIT_MAX_HEXSZ);
 		label = p = state->buf.buf;
 
 		find_unique_abbrev_r(p, oid, default_abbrev);
@@ -4500,7 +4500,7 @@  static const char *label_oid(struct object_id *oid, const char *label,
 			size_t i = strlen(p) + 1;
 
 			oid_to_hex_r(p, oid);
-			for (; i < GIT_SHA1_HEXSZ; i++) {
+			for (; i < the_hash_algo->hexsz; i++) {
 				char save = p[i];
 				p[i] = '\0';
 				if (!hashmap_get_from_hash(&state->labels,

[15/26] sequencer: convert to use the_hash_algo

Commit Message

Patch