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

* js/maint-1.6.6-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 aef47f8611a6595d93e41902f84698a607fac616..fb110eb43000a6df87407e2e626591d0444cee66 100644 (file)
--- a/builtin-send-pack.c
+++ b/builtin-send-pack.c
@@ -225,11 +225,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;
 }