summaryrefslogtreecommitdiff
path: root/builtin/send-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-20 03:37:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-20 03:37:19 (GMT)
commit5c359a66586cfa802f9a4b205da9750582bdb9ec (patch)
treee6d48fc77677ca982e6bcfe085ea2a9a8360c711 /builtin/send-pack.c
parent6699c959efccc7cb969b87bdf8e0154a0fe9ccc8 (diff)
parent1c1f046c43d3bb9ba2c094bbe2e87df833b71508 (diff)
downloadgit-5c359a66586cfa802f9a4b205da9750582bdb9ec.zip
git-5c359a66586cfa802f9a4b205da9750582bdb9ec.tar.gz
git-5c359a66586cfa802f9a4b205da9750582bdb9ec.tar.bz2
Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix'
* js/maint-send-pack-stateless-rpc-deadlock-fix: sideband_demux(): fix decl-after-stmt
Diffstat (limited to 'builtin/send-pack.c')
-rw-r--r--builtin/send-pack.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index 4ac2ca9..e6a3495 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;
}