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

* js/maint-send-pack-stateless-rpc-deadlock-fix: sideband_demux(): fix decl-after-stmt
git-mirror · May 20, 2011 · 5c359a6 · 5c359a6
2 parents 6699c95 + 1c1f046
commit 5c359a6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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;
 }