diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-06-09 00:29:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-09 00:29:36 -0700 |
| commit | f4f78e668dd40f2d4a5bc119cccb3c34c2675c38 (patch) | |
| tree | 087d0d3e360643fcc12cef76bdbbb1c60686803c /builtin-fetch-pack.c | |
| parent | bash: add support for 'git stash pop --index' option (diff) | |
| parent | diff.c: plug a memory leak in an error path (diff) | |
| download | tgif-f4f78e668dd40f2d4a5bc119cccb3c34c2675c38.tar.xz | |
Merge branch 'maint'
* maint:
diff.c: plug a memory leak in an error path
fetch-pack: close output channel after sideband demultiplexer terminates
builtin-remote: Make "remote show" display all urls
Diffstat (limited to 'builtin-fetch-pack.c')
| -rw-r--r-- | builtin-fetch-pack.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin-fetch-pack.c b/builtin-fetch-pack.c index 6202462216..629735f547 100644 --- a/builtin-fetch-pack.c +++ b/builtin-fetch-pack.c @@ -483,7 +483,9 @@ static int sideband_demux(int fd, void *data) { int *xd = data; - return recv_sideband("fetch-pack", xd[0], fd); + int ret = recv_sideband("fetch-pack", xd[0], fd); + close(fd); + return ret; } static int get_pack(int xd[2], char **pack_lockfile) |