summaryrefslogtreecommitdiff
path: root/fetch-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-10-30 12:10:45 -0700
committerJunio C Hamano <gitster@pobox.com>2013-10-30 12:10:45 -0700
commit832ee79ab89d5908bcfd6fda89eacb0e665de2ef (patch)
treecd4bb21850218356ef07a7a545bad3a5ea908a18 /fetch-pack.c
parent02882bc8344b851f7f371905678bb5c88b8eaea6 (diff)
parent37cb1dd671e5e22cee363f98637a5a58f16be054 (diff)
downloadgit-832ee79ab89d5908bcfd6fda89eacb0e665de2ef.tar.gz
Merge branch 'jl/pack-transfer-avoid-double-close'
The codepath that send_pack() calls pack_objects() mistakenly closed the same file descriptor twice, leading to potentially closing a wrong file descriptor that was opened in the meantime. * jl/pack-transfer-avoid-double-close: Clear fd after closing to avoid double-close error
Diffstat (limited to 'fetch-pack.c')
-rw-r--r--fetch-pack.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/fetch-pack.c b/fetch-pack.c
index a0e0350ae6..1042448fa0 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -747,6 +747,10 @@ static int get_pack(struct fetch_pack_args *args,
close(cmd.out);
}
+ if (!use_sideband)
+ /* Closed by start_command() */
+ xd[0] = -1;
+
ret = finish_command(&cmd);
if (!ret || (args->check_self_contained_and_connected && ret == 1))
args->self_contained_and_connected =