Merge branch 'jk/index-pack-maint'

diff --git a/sequencer.c b/sequencer.c
index 560fc9b67d480069328d379421c606d800e82135..cca968043ea86c4515e6af1b4fe9251a0140c0a3 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -3792,7 +3792,7 @@ static const char *label_oid(struct object_id *oid, const char *label,
                                p[i] = save;
                        }
                }
-       } else if (((len = strlen(label)) == GIT_SHA1_RAWSZ &&
+       } else if (((len = strlen(label)) == the_hash_algo->hexsz &&
                    !get_oid_hex(label, &dummy)) ||
                   (len == 1 && *label == '#') ||
                   hashmap_get_from_hash(&state->labels,