mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remote: convert functions to struct object_id

Browse Source 
Convert several unsigned char arrays to use struct object_id instead,
and change hard-coded 40-based constants to use GIT_SHA1_HEXSZ as well.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Jeff King <peff@peff.net>
This commit is contained in:
brian m. carlson
2015-11-10 02:22:30 +00:00
committed by Jeff King
parent ed1c9977cb
commit fcd30b1387
1 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
remote.c
View File

@ -456,7 +456,7 @@ static void alias_all_urls(void)
static void read_config(void) static void read_config(void)
{ {
static int loaded; static int loaded;
unsigned char sha1[20]; struct object_id oid;
const char *head_ref; const char *head_ref;
int flag; int flag;
@ -465,7 +465,7 @@ static void read_config(void)
loaded = 1; loaded = 1;
current_branch = NULL; current_branch = NULL;
head_ref = resolve_ref_unsafe("HEAD", 0, sha1, &flag); head_ref = resolve_ref_unsafe("HEAD", 0, oid.hash, &flag);
if (head_ref && (flag & REF_ISSYMREF) && if (head_ref && (flag & REF_ISSYMREF) &&
skip_prefix(head_ref, "refs/heads/", &head_ref)) { skip_prefix(head_ref, "refs/heads/", &head_ref)) {
current_branch = make_branch(head_ref, 0); current_branch = make_branch(head_ref, 0);
@ -544,12 +544,12 @@ static struct refspec *parse_refspec_internal(int nr_refspec, const char **refsp
flags = REFNAME_ALLOW_ONELEVEL | (is_glob ? REFNAME_REFSPEC_PATTERN : 0); flags = REFNAME_ALLOW_ONELEVEL | (is_glob ? REFNAME_REFSPEC_PATTERN : 0);
if (fetch) { if (fetch) {
unsigned char unused[40]; struct object_id unused;
/* LHS */ /* LHS */
if (!*rs[i].src) if (!*rs[i].src)
; /* empty is ok; it means "HEAD" */ ; /* empty is ok; it means "HEAD" */
else if (llen == 40 && !get_sha1_hex(rs[i].src, unused)) else if (llen == GIT_SHA1_HEXSZ && !get_oid_hex(rs[i].src, &unused))
rs[i].exact_sha1 = 1; /* ok */ rs[i].exact_sha1 = 1; /* ok */
else if (!check_refname_format(rs[i].src, flags)) else if (!check_refname_format(rs[i].src, flags))
; /* valid looking ref is ok */ ; /* valid looking ref is ok */
@ -1082,7 +1082,7 @@ static struct ref *alloc_delete_ref(void)
static int try_explicit_object_name(const char *name, static int try_explicit_object_name(const char *name,
struct ref **match) struct ref **match)
{ {
unsigned char sha1[20]; struct object_id oid;
if (!*name) { if (!*name) {
if (match) if (match)
@ -1090,12 +1090,12 @@ static int try_explicit_object_name(const char *name,
return 0; return 0;
} }
if (get_sha1(name, sha1)) if (get_sha1(name, oid.hash))
return -1; return -1;
if (match) { if (match) {
*match = alloc_ref(name); *match = alloc_ref(name);
hashcpy((*match)->new_oid.hash, sha1); oidcpy(&(*match)->new_oid, &oid);
} }
return 0; return 0;
} }
@ -1110,10 +1110,10 @@ static struct ref *make_linked_ref(const char *name, struct ref ***tail)
static char *guess_ref(const char *name, struct ref *peer) static char *guess_ref(const char *name, struct ref *peer)
{ {
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
unsigned char sha1[20]; struct object_id oid;
const char *r = resolve_ref_unsafe(peer->name, RESOLVE_REF_READING, const char *r = resolve_ref_unsafe(peer->name, RESOLVE_REF_READING,
sha1, NULL); oid.hash, NULL);
if (!r) if (!r)
return NULL; return NULL;
@ -1171,12 +1171,12 @@ static int match_explicit(struct ref *src, struct ref *dst,
return -1; return -1;
if (!dst_value) { if (!dst_value) {
unsigned char sha1[20]; struct object_id oid;
int flag; int flag;
dst_value = resolve_ref_unsafe(matched_src->name, dst_value = resolve_ref_unsafe(matched_src->name,
RESOLVE_REF_READING, RESOLVE_REF_READING,
sha1, &flag); oid.hash, &flag);
if (!dst_value || if (!dst_value ||
((flag & REF_ISSYMREF) && ((flag & REF_ISSYMREF) &&
!starts_with(dst_value, "refs/heads/"))) !starts_with(dst_value, "refs/heads/")))
@ -1292,13 +1292,13 @@ struct tips {
int nr, alloc; int nr, alloc;
}; };
static void add_to_tips(struct tips *tips, const unsigned char *sha1) static void add_to_tips(struct tips *tips, const struct object_id *oid)
{ {
struct commit *commit; struct commit *commit;
if (is_null_sha1(sha1)) if (is_null_oid(oid))
return; return;
commit = lookup_commit_reference_gently(sha1, 1); commit = lookup_commit_reference_gently(oid->hash, 1);
if (!commit || (commit->object.flags & TMP_MARK)) if (!commit || (commit->object.flags & TMP_MARK))
return; return;
commit->object.flags |= TMP_MARK; commit->object.flags |= TMP_MARK;
@ -1322,9 +1322,9 @@ static void add_missing_tags(struct ref *src, struct ref **dst, struct ref ***ds
for (ref = *dst; ref; ref = ref->next) { for (ref = *dst; ref; ref = ref->next) {
if (ref->peer_ref && if (ref->peer_ref &&
!is_null_oid(&ref->peer_ref->new_oid)) !is_null_oid(&ref->peer_ref->new_oid))
add_to_tips(&sent_tips, ref->peer_ref->new_oid.hash); add_to_tips(&sent_tips, &ref->peer_ref->new_oid);
else else
add_to_tips(&sent_tips, ref->old_oid.hash); add_to_tips(&sent_tips, &ref->old_oid);
if (starts_with(ref->name, "refs/tags/")) if (starts_with(ref->name, "refs/tags/"))
string_list_append(&dst_tag, ref->name); string_list_append(&dst_tag, ref->name);
} }
@ -1609,7 +1609,7 @@ static void set_merge(struct branch *ret)
{ {
struct remote *remote; struct remote *remote;
char *ref; char *ref;
unsigned char sha1[20]; struct object_id oid;
int i; int i;
if (!ret) if (!ret)
@ -1635,7 +1635,7 @@ static void set_merge(struct branch *ret)
strcmp(ret->remote_name, ".")) strcmp(ret->remote_name, "."))
continue; continue;
if (dwim_ref(ret->merge_name[i], strlen(ret->merge_name[i]), if (dwim_ref(ret->merge_name[i], strlen(ret->merge_name[i]),
sha1, &ref) == 1) oid.hash, &ref) == 1)
ret->merge[i]->dst = ref; ret->merge[i]->dst = ref;
else else
ret->merge[i]->dst = xstrdup(ret->merge_name[i]); ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
@ -1795,10 +1795,10 @@ const char *branch_get_push(struct branch *branch, struct strbuf *err)
static int ignore_symref_update(const char *refname) static int ignore_symref_update(const char *refname)
{ {
unsigned char sha1[20]; struct object_id oid;
int flag; int flag;
if (!resolve_ref_unsafe(refname, 0, sha1, &flag)) if (!resolve_ref_unsafe(refname, 0, oid.hash, &flag))
return 0; /* non-existing refs are OK */ return 0; /* non-existing refs are OK */
return (flag & REF_ISSYMREF); return (flag & REF_ISSYMREF);
} }
@ -1995,7 +1995,7 @@ int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid)
int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs, int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
const char **upstream_name) const char **upstream_name)
{ {
unsigned char sha1[20]; struct object_id oid;
struct commit *ours, *theirs; struct commit *ours, *theirs;
struct rev_info revs; struct rev_info revs;
const char *base; const char *base;
@ -2009,15 +2009,15 @@ int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
return -1; return -1;
/* Cannot stat if what we used to build on no longer exists */ /* Cannot stat if what we used to build on no longer exists */
if (read_ref(base, sha1)) if (read_ref(base, oid.hash))
return -1; return -1;
theirs = lookup_commit_reference(sha1); theirs = lookup_commit_reference(oid.hash);
if (!theirs) if (!theirs)
return -1; return -1;
if (read_ref(branch->refname, sha1)) if (read_ref(branch->refname, oid.hash))
return -1; return -1;
ours = lookup_commit_reference(sha1); ours = lookup_commit_reference(oid.hash);
if (!ours) if (!ours)
return -1; return -1;
@ -2328,14 +2328,14 @@ int is_empty_cas(const struct push_cas_option *cas)
* If we cannot do so, return negative to signal an error. * If we cannot do so, return negative to signal an error.
*/ */
static int remote_tracking(struct remote *remote, const char *refname, static int remote_tracking(struct remote *remote, const char *refname,
unsigned char sha1[20]) struct object_id *oid)
{ {
char *dst; char *dst;
dst = apply_refspecs(remote->fetch, remote->fetch_refspec_nr, refname); dst = apply_refspecs(remote->fetch, remote->fetch_refspec_nr, refname);
if (!dst) if (!dst)
return -1; /* no tracking ref for refname at remote */ return -1; /* no tracking ref for refname at remote */
if (read_ref(dst, sha1)) if (read_ref(dst, oid->hash))
return -1; /* we know what the tracking ref is but we cannot read it */ return -1; /* we know what the tracking ref is but we cannot read it */
return 0; return 0;
} }
@ -2354,7 +2354,7 @@ static void apply_cas(struct push_cas_option *cas,
ref->expect_old_sha1 = 1; ref->expect_old_sha1 = 1;
if (!entry->use_tracking) if (!entry->use_tracking)
hashcpy(ref->old_oid_expect.hash, cas->entry[i].expect); hashcpy(ref->old_oid_expect.hash, cas->entry[i].expect);
else if (remote_tracking(remote, ref->name, ref->old_oid_expect.hash)) else if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
ref->expect_old_no_trackback = 1; ref->expect_old_no_trackback = 1;
return; return;
} }
@ -2364,7 +2364,7 @@ static void apply_cas(struct push_cas_option *cas,
return; return;
ref->expect_old_sha1 = 1; ref->expect_old_sha1 = 1;
if (remote_tracking(remote, ref->name, ref->old_oid_expect.hash)) if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
ref->expect_old_no_trackback = 1; ref->expect_old_no_trackback = 1;
} }