diff options
Diffstat (limited to 'builtin/notes.c')
| -rw-r--r-- | builtin/notes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/notes.c b/builtin/notes.c index 1a6785920a..52aa9af74b 100644 --- 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); |