From: Michael Haggerty <mhagger@alum.mit.edu>
Date: Mon, 25 May 2015 18:38:47 +0000 (+0000)
Subject: append_one_rev(): rewrite to work with object_id
X-Git-Tag: v2.5.0-rc0~54^2~35
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7a456c1eea83b7589b9f37fd56f53719ab431b86

append_one_rev(): rewrite to work with object_id

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/show-branch.c b/builtin/show-branch.c
index 7e006577e2..b861e41926 100644
--- a/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@ -536,9 +536,9 @@ static int show_independent(struct commit **rev,
 
 static void append_one_rev(const char *av)
 {
-	unsigned char revkey[20];
-	if (!get_sha1(av, revkey)) {
-		append_ref(av, revkey, 0);
+	struct object_id revkey;
+	if (!get_sha1(av, revkey.hash)) {
+		append_ref(av, revkey.hash, 0);
 		return;
 	}
 	if (strchr(av, '*') || strchr(av, '?') || strchr(av, '[')) {