From 7d924c9139e33e7599d7aed0446e634c427a5f15 Mon Sep 17 00:00:00 2001 From: "brian m. carlson" Date: Sun, 17 Apr 2016 23:10:39 +0000 Subject: struct name_entry: use struct object_id instead of unsigned char sha1[20] Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano --- notes.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'notes.c') diff --git a/notes.c b/notes.c index 88cf4747c..e4e4854d6 100644 --- a/notes.c +++ b/notes.c @@ -446,7 +446,7 @@ static void load_subtree(struct notes_tree *t, struct leaf_node *subtree, l = (struct leaf_node *) xcalloc(1, sizeof(struct leaf_node)); hashcpy(l->key_sha1, object_sha1); - hashcpy(l->val_sha1, entry.sha1); + hashcpy(l->val_sha1, entry.oid->hash); if (len < 20) { if (!S_ISDIR(entry.mode) || path_len != 2) goto handle_non_note; /* not subtree */ @@ -493,7 +493,7 @@ handle_non_note: } strbuf_addstr(&non_note_path, entry.path); add_non_note(t, strbuf_detach(&non_note_path, NULL), - entry.mode, entry.sha1); + entry.mode, entry.oid->hash); } } free(buf); -- cgit v1.2.1