summaryrefslogtreecommitdiff
path: root/upload-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-12-03 08:18:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-12-03 08:18:07 (GMT)
commitf3a112a75effe4ea7dca4d47edeced43fb77691a (patch)
tree274b70e601e813d1963c778ed238bf4fbd2b711e /upload-pack.c
parentadae5df5d22d97888987d6e070a91a7b04289c6f (diff)
parent309a4028e72b5f6050d5cf17b5056cc3ea14c16b (diff)
downloadgit-f3a112a75effe4ea7dca4d47edeced43fb77691a.zip
git-f3a112a75effe4ea7dca4d47edeced43fb77691a.tar.gz
git-f3a112a75effe4ea7dca4d47edeced43fb77691a.tar.bz2
Merge branch 'jk/stop-pack-objects-when-fetch-is-killed'
"git fetch" that is killed may leave a pack-objects process behind, still computing to find a good compression, wasting cycles. This has been corrected. * jk/stop-pack-objects-when-fetch-is-killed: upload-pack: kill pack-objects helper on signal or exit
Diffstat (limited to 'upload-pack.c')
-rw-r--r--upload-pack.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/upload-pack.c b/upload-pack.c
index 5dc8e1f..1006beb 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -321,6 +321,7 @@ static void create_pack_file(struct upload_pack_data *pack_data,
pack_objects.in = -1;
pack_objects.out = -1;
pack_objects.err = -1;
+ pack_objects.clean_on_exit = 1;
if (start_command(&pack_objects))
die("git upload-pack: unable to fork git-pack-objects");