diff options
author | brian m. carlson <sandals@crustytoothpaste.net> | 2016-04-17 23:10:39 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-04-25 14:23:42 -0700 |
commit | 7d924c9139e33e7599d7aed0446e634c427a5f15 (patch) | |
tree | 61d1667fff3d183398d5223d86805ec44264a518 /notes.c | |
parent | 82db3d44e7a9d9219dd8e19607026bae9e435012 (diff) | |
download | git-7d924c9139e33e7599d7aed0446e634c427a5f15.tar.gz |
struct name_entry: use struct object_id instead of unsigned char sha1[20]
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'notes.c')
-rw-r--r-- | notes.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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); |