patch-id: use oid_to_hex() to print multiple object IDs

rscharfe · gitster · commit 4507ecc7710e · 2019-12-09T12:26:40.000-08:00
flush_current_id() prints the hexadecimal representation of two object IDs. When the code was added in f976722 (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 dcb3450 (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. 1a876a6 (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 <l.s.r@web.de> Acked-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -5,13 +5,8 @@`
`5`	`5`
`6`	`6`	`static void flush_current_id(int patchlen, struct object_id id, struct object_id result)`
`7`	`7`	`{`
`8`		`- char name[GIT_MAX_HEXSZ + 1];`
`9`		`-`
`10`		`- if (!patchlen)`
`11`		`- return;`
`12`		`-`
`13`		`- memcpy(name, oid_to_hex(id), the_hash_algo->hexsz + 1);`
`14`		`- printf("%s %s\n", oid_to_hex(result), name);`
	`8`	`+ if (patchlen)`
	`9`	`+ printf("%s %s\n", oid_to_hex(result), oid_to_hex(id));`
`15`	`10`	`}`
`16`	`11`
`17`	`12`	`static int remove_space(char *line)`