builtin-am: implement --resolved/--continue

diff --git a/builtin/show-ref.c b/builtin/show-ref.c
index 18f84fbc53883ceb30564b44e604361857aa9f33..dfbc314ac27aae11a660e04d821816325c040e67 100644 (file)
--- a/builtin/show-ref.c
+++ b/builtin/show-ref.c
@@ -30,7 +30,7 @@ static int show_ref(const char *refname, const struct object_id *oid,
                    int flag, void *cbdata)
 {
        const char *hex;
-       unsigned char peeled[20];
+       struct object_id peeled;
 
        if (show_head && !strcmp(refname, "HEAD"))
                goto match;
@@ -82,8 +82,8 @@ static int show_ref(const char *refname, const struct object_id *oid,
        if (!deref_tags)
                return 0;
 
-       if (!peel_ref(refname, peeled)) {
-               hex = find_unique_abbrev(peeled, abbrev);
+       if (!peel_ref(refname, peeled.hash)) {
+               hex = find_unique_abbrev(peeled.hash, abbrev);
                printf("%s %s^{}\n", hex, refname);
        }
        return 0;