summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Kelley <phkelley@hotmail.com>2013-02-10 18:16:10 -0500
committerPhilip Kelley <phkelley@hotmail.com>2013-02-10 18:16:10 -0500
commita150cc875da834fc18b2c60fa2cb5580fff532ab (patch)
tree89a1a36b573169b5e4e923c79db63458fd077d57
parenta9d081e504d596d97ae2026b76993fa229efa9e7 (diff)
downloadlibgit2-a150cc875da834fc18b2c60fa2cb5580fff532ab.tar.gz
Fix a bug introduced in df93a681 'Merge the push...'
-rw-r--r--src/transports/smart_protocol.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/transports/smart_protocol.c b/src/transports/smart_protocol.c
index aca06175c..0fae086cb 100644
--- a/src/transports/smart_protocol.c
+++ b/src/transports/smart_protocol.c
@@ -653,7 +653,7 @@ static int update_refs_from_report(
{
git_pkt_ref *ref;
push_spec *push_spec;
- push_status *push_status = NULL;
+ push_status *push_status;
size_t i, j, refs_len;
int cmp;
@@ -688,6 +688,7 @@ static int update_refs_from_report(
/* Merge join push_specs with refs */
while (i < push_specs->length && j < refs_len) {
push_spec = git_vector_get(push_specs, i);
+ push_status = git_vector_get(push_report, i);
ref = git_vector_get(refs, j);
cmp = strcmp(push_spec->rref, ref->head.name);
@@ -710,6 +711,7 @@ static int update_refs_from_report(
for (; i < push_specs->length; i++) {
push_spec = git_vector_get(push_specs, i);
+ push_status = git_vector_get(push_report, i);
/* Add case */
if (!push_status->msg &&