Merge branch 'js/dirname-basename' into maint

diff --git a/decorate.c b/decorate.c
index b2aac90c26296eacdd6c2cdb68a15f3744c595e9..270eb2519764f1378fe53352021cd7afb3ea306a 100644 (file)
--- a/decorate.c
+++ b/decorate.c
@@ -8,7 +8,7 @@
 
 static unsigned int hash_obj(const struct object *obj, unsigned int n)
 {
-       return sha1hash(obj->sha1) % n;
+       return sha1hash(obj->oid.hash) % n;
 }
 
 static void *insert_decoration(struct decoration *n, const struct object *base, void *decoration)