diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-05-21 03:13:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-21 03:13:07 -0700 |
| commit | 1be270cbdfd46a34fb8ce39ec31bb593137096fc (patch) | |
| tree | 8a5add1291b6f53d82a36214adbdaefbbeac7881 /run-command.c | |
| parent | c06ee3193e7873fde3525045e88c5741cefc91c4 (diff) | |
| parent | c8b296450e5148c576697ea4709072b7855aacd5 (diff) | |
| download | git-1be270cbdfd46a34fb8ce39ec31bb593137096fc.tar.gz | |
Merge branch 'maint'
* maint:
Fix checkout of large files to network shares on Windows XP
start_command: close cmd->err descriptor when fork/spawn fails
Fix "Out of memory? mmap failed" for files larger than 4GB on Windows
Diffstat (limited to 'run-command.c')
| -rw-r--r-- | run-command.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/run-command.c b/run-command.c index eb5c575629..c7793f50fb 100644 --- a/run-command.c +++ b/run-command.c @@ -383,6 +383,8 @@ fail_pipe: close(cmd->out); if (need_err) close_pair(fderr); + else if (cmd->err) + close(cmd->err); errno = failed_errno; return -1; } |