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 /remote.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 'remote.c')
| -rw-r--r-- | remote.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -2002,13 +2002,13 @@ int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs, return -1; /* Cannot stat if what we used to build on no longer exists */ - if (read_ref(base, oid.hash)) + if (read_ref(base, &oid)) return -1; theirs = lookup_commit_reference(&oid); if (!theirs) return -1; - if (read_ref(branch->refname, oid.hash)) + if (read_ref(branch->refname, &oid)) return -1; ours = lookup_commit_reference(&oid); if (!ours) @@ -2327,7 +2327,7 @@ static int remote_tracking(struct remote *remote, const char *refname, dst = apply_refspecs(remote->fetch, remote->fetch_refspec_nr, refname); if (!dst) return -1; /* no tracking ref for refname at remote */ - if (read_ref(dst, oid->hash)) + if (read_ref(dst, oid)) return -1; /* we know what the tracking ref is but we cannot read it */ return 0; } |