Merge branch 'js/dirname-basename' into maint

diff --git a/builtin/notes.c b/builtin/notes.c
index 1a6785920a5f91673e5e5697e31cfebd5746b5ab..52aa9af74be8d47780d4762185c5cbe09624b382 100644 (file)
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -707,7 +707,7 @@ static int merge_commit(struct notes_merge_options *o)
                die("Could not parse commit from NOTES_MERGE_PARTIAL.");
 
        if (partial->parents)
-               hashcpy(parent_sha1, get_object_hash(partial->parents->item->object));
+               hashcpy(parent_sha1, partial->parents->item->object.oid.hash);
        else
                hashclr(parent_sha1);