Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
send_ref(): convert local variable "peeled" to object_id
author
Michael Haggerty
<mhagger@alum.mit.edu>
Mon, 25 May 2015 18:39:13 +0000
(18:39 +0000)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 25 May 2015 19:19:37 +0000
(12:19 -0700)
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
upload-pack.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
363e98b
)
diff --git
a/upload-pack.c
b/upload-pack.c
index 929284f050fa6df444497f43487905dccfb521d3..1cb9a948aa05ac4ba274c1e729e64bdf09c483ea 100644
(file)
--- a/
upload-pack.c
+++ b/
upload-pack.c
@@
-717,7
+717,7
@@
static int send_ref(const char *refname, const struct object_id *oid,
" side-band-64k ofs-delta shallow no-progress"
" include-tag multi_ack_detailed";
const char *refname_nons = strip_namespace(refname);
" side-band-64k ofs-delta shallow no-progress"
" include-tag multi_ack_detailed";
const char *refname_nons = strip_namespace(refname);
-
unsigned char peeled[20]
;
+
struct object_id peeled
;
if (mark_our_ref(refname, oid))
return 0;
if (mark_our_ref(refname, oid))
return 0;
@@
-738,8
+738,8
@@
static int send_ref(const char *refname, const struct object_id *oid,
packet_write(1, "%s %s\n", oid_to_hex(oid), refname_nons);
}
capabilities = NULL;
packet_write(1, "%s %s\n", oid_to_hex(oid), refname_nons);
}
capabilities = NULL;
- if (!peel_ref(refname, peeled))
- packet_write(1, "%s %s^{}\n",
sha1_to_hex(
peeled), refname_nons);
+ if (!peel_ref(refname, peeled
.hash
))
+ packet_write(1, "%s %s^{}\n",
oid_to_hex(&
peeled), refname_nons);
return 0;
}
return 0;
}