From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 20 May 2011 03:37:19 +0000 (-0700)
Subject: Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix'
X-Git-Tag: v1.7.6-rc0~56
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5c359a66586cfa802f9a4b205da9750582bdb9ec?hp=6699c959efccc7cb969b87bdf8e0154a0fe9ccc8

Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix'

* js/maint-send-pack-stateless-rpc-deadlock-fix:
sideband_demux(): fix decl-after-stmt
---

diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index 4ac2ca984f..e6a3495e1c 100644
--- a/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@ -228,11 +228,11 @@ static void print_helper_status(struct ref *ref)
 
 static int sideband_demux(int in, int out, void *data)
 {
-	int *fd = data;
+	int *fd = data, ret;
 #ifdef NO_PTHREADS
 	close(fd[1]);
 #endif
-	int ret = recv_sideband("send-pack", fd[0], out);
+	ret = recv_sideband("send-pack", fd[0], out);
 	close(out);
 	return ret;
 }