From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 May 2011 00:01:03 +0000 (-0700)
Subject: Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/maint... 
X-Git-Tag: v1.7.5.3~13^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1c1f046c43d3bb9ba2c094bbe2e87df833b71508;p=git.git

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
---

1c1f046c43d3bb9ba2c094bbe2e87df833b71508
diff --cc builtin-send-pack.c
index aef47f861,dfd3d1105..fb110eb43
--- a/builtin-send-pack.c
+++ b/builtin-send-pack.c
@@@ -225,11 -374,11 +225,11 @@@ static void print_helper_status(struct 
  
  static int sideband_demux(int in, int out, void *data)
  {
- 	int *fd = data;
+ 	int *fd = data, ret;
 -#ifndef WIN32
 +#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;
  }