From 4507ecc7710e172ed36421eaa4efe743785ccb4b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ren=C3=A9=20Scharfe?= Date: Sat, 7 Dec 2019 20:16:51 +0100 Subject: [PATCH] patch-id: use oid_to_hex() to print multiple object IDs MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit flush_current_id() prints the hexadecimal representation of two object IDs. When the code was added in f97672225b (Add "git-patch-id" program to generate patch ID's., 2005-06-23), sha1_to_hex() had only a single internal static buffer, so the result of one invocation had to be stored in a local buffer. Since dcb3450fd8 (sha1_to_hex() usage cleanup, 2006-05-03) it rotates through four buffers, which allows to print up to four object IDs at the same time. 1a876a69af6 (patch-id: convert to use struct object_id, 2015-03-13) replaced sha1_to_hex() with oid_to_hex(), which has the same feature. Use it to simplify the code. Signed-off-by: René Scharfe Acked-by: brian m. carlson Signed-off-by: Junio C Hamano --- builtin/patch-id.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/builtin/patch-id.c b/builtin/patch-id.c index 3059e525b8..822ffff51f 100644 --- a/builtin/patch-id.c +++ b/builtin/patch-id.c @@ -5,13 +5,8 @@ static void flush_current_id(int patchlen, struct object_id *id, struct object_id *result) { - char name[GIT_MAX_HEXSZ + 1]; - - if (!patchlen) - return; - - memcpy(name, oid_to_hex(id), the_hash_algo->hexsz + 1); - printf("%s %s\n", oid_to_hex(result), name); + if (patchlen) + printf("%s %s\n", oid_to_hex(result), oid_to_hex(id)); } static int remove_space(char *line) -- 2.11.4.GIT