diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-16 17:01:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-16 17:01:03 -0700 |
| commit | 1c1f046c43d3bb9ba2c094bbe2e87df833b71508 (patch) | |
| tree | 370fb89090b0609c677f91593e5ebde5980567e8 | |
| parent | Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/ma... (diff) | |
| parent | sideband_demux(): fix decl-after-stmt (diff) | |
| download | git-1c1f046c43d3bb9ba2c094bbe2e87df833b71508.tar.gz git-1c1f046c43d3bb9ba2c094bbe2e87df833b71508.zip | |
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
| -rw-r--r-- | builtin-send-pack.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-send-pack.c b/builtin-send-pack.c index aef47f8611..fb110eb430 100644 --- 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; } |