undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

push_refs_with_export: convert to struct object_id

Browse Source 
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:24 +00:00 committed by Jeff King
parent e96b16cc2a
commit 27912a03fd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
transport-helper.c
View File

@ -878,13 +878,13 @@ static int push_refs_with_export(struct transport *transport,
for (ref = remote_refs; ref; ref = ref->next) { for (ref = remote_refs; ref; ref = ref->next) {
char *private; char *private;
unsigned char sha1[20]; struct object_id oid;
private = apply_refspecs(data->refspecs, data->refspec_nr, ref->name); private = apply_refspecs(data->refspecs, data->refspec_nr, ref->name);
if (private && !get_sha1(private, sha1)) { if (private && !get_sha1(private, oid.hash)) {
strbuf_addf(&buf, "^%s", private); strbuf_addf(&buf, "^%s", private);
string_list_append(&revlist_args, strbuf_detach(&buf, NULL)); string_list_append(&revlist_args, strbuf_detach(&buf, NULL));
hashcpy(ref->old_oid.hash, sha1); oidcpy(&ref->old_oid, &oid);
} }
free(private); free(private);
@ -898,7 +898,7 @@ static int push_refs_with_export(struct transport *transport,
name = resolve_ref_unsafe( name = resolve_ref_unsafe(
ref->peer_ref->name, ref->peer_ref->name,
RESOLVE_REF_READING, RESOLVE_REF_READING,
sha1, &flag); oid.hash, &flag);
if (!name || !(flag & REF_ISSYMREF)) if (!name || !(flag & REF_ISSYMREF))
name = ref->peer_ref->name; name = ref->peer_ref->name;