diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2017-10-15 22:06:57 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-16 11:05:51 +0900 |
| commit | cca5fa6406046c19ab5a8117fe71bf4402c00d88 (patch) | |
| tree | b7305cc09752a86366cb4695cd504adec207e022 /upload-pack.c | |
| parent | 34c290a6fc8b1f6705d2646d726df2260927da0f (diff) | |
| download | git-cca5fa6406046c19ab5a8117fe71bf4402c00d88.tar.gz | |
refs: convert dwim_ref and expand_ref to struct object_id
All of the callers of these functions just pass the hash member of a
struct object_id, so convert them to use a pointer to struct object_id
directly. Insert a check for NULL in expand_ref on a temporary basis;
this check can be removed when resolve_ref_unsafe is converted as well.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'upload-pack.c')
| -rw-r--r-- | upload-pack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/upload-pack.c b/upload-pack.c index e25f725c0f..030eba5a0c 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -787,7 +787,7 @@ static void receive_needs(void) if (skip_prefix(line, "deepen-not ", &arg)) { char *ref = NULL; struct object_id oid; - if (expand_ref(arg, strlen(arg), oid.hash, &ref) != 1) + if (expand_ref(arg, strlen(arg), &oid, &ref) != 1) die("git upload-pack: ambiguous deepen-not: %s", line); string_list_append(&deepen_not, ref); free(ref); |