diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2017-10-15 22:06:56 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-16 02:05:50 (GMT) |
| commit | 34c290a6fc8b1f6705d2646d726df2260927da0f (patch) | |
| tree | 669c6569783ec61850be600dcd1b8496cabbf66d /notes-merge.c | |
| parent | 0f2dc722dd01097d1e1c1dac43b2f57924594457 (diff) | |
| download | git-34c290a6fc8b1f6705d2646d726df2260927da0f.zip git-34c290a6fc8b1f6705d2646d726df2260927da0f.tar.gz git-34c290a6fc8b1f6705d2646d726df2260927da0f.tar.bz2 | |
refs: convert read_ref and read_ref_full to object_id
All but two of the call sites already have parameters using the hash
parameter of struct object_id, so convert them to take a pointer to the
struct directly. Also convert refs_read_refs_full, the underlying
implementation.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 4352c34..30ec83a 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)) |