diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2017-10-28 09:27:15 +0200 |
|---|---|---|
| committer | Michael Haggerty <mhagger@alum.mit.edu> | 2017-10-28 09:27:15 +0200 |
| commit | ff08e56cde739152a59a86f5aa996954a2ec0614 (patch) | |
| tree | 9c7bc94151c5a082377ecb438e66aea140924edb /notes-merge.c | |
| parent | 2f899857a9f425cb59f8a15c2ea7a52100c51a23 (diff) | |
| parent | 4f01e5080c4a7eee69da47c958888358e6127584 (diff) | |
Merge branch 'bc/object-id' into base
Diffstat (limited to 'notes-merge.c')
| -rw-r--r-- | notes-merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/notes-merge.c b/notes-merge.c index 4352c34a6e..30ec83ab04 100644 --- a/notes-merge.c +++ b/notes-merge.c @@ -547,7 +547,7 @@ int notes_merge(struct notes_merge_options *o, o->local_ref, o->remote_ref); /* Dereference o->local_ref into local_sha1 */ - if (read_ref_full(o->local_ref, 0, local_oid.hash, NULL)) + if (read_ref_full(o->local_ref, 0, &local_oid, NULL)) die("Failed to resolve local notes ref '%s'", o->local_ref); else if (!check_refname_format(o->local_ref, 0) && is_null_oid(&local_oid)) |