OSDN Git Service
(root)
/
git-core
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
80b5b69
6143214
)
Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/maint...
author
Junio C Hamano
<gitster@pobox.com>
Tue, 17 May 2011 00:01:03 +0000
(17:01 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 17 May 2011 00:01:03 +0000
(17:01 -0700)
* js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix:
sideband_demux(): fix decl-after-stmt
1
2
builtin-send-pack.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
builtin-send-pack.c
index
aef47f8
,
dfd3d11
..
fb110eb
---
1
/
builtin-send-pack.c
---
2
/
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
;
-#if
ndef WIN32
+#if
def 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;
}