summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-12-03 00:18:06 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-12-03 00:18:06 -0800
commitadae5df5d22d97888987d6e070a91a7b04289c6f (patch)
tree5fc7ceaec2b5c1d982dfab6f1f9ff39dcec2346e
parentMerge branch 'tb/repack-simplify' (diff)
parentsend-pack: kill pack-objects helper on signal or exit (diff)
downloadtgif-adae5df5d22d97888987d6e070a91a7b04289c6f.tar.xz
Merge branch 'jk/stop-pack-objects-when-push-is-killed'
"git push" 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-push-is-killed: send-pack: kill pack-objects helper on signal or exit
-rw-r--r--send-pack.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/send-pack.c b/send-pack.c
index eb4a44270b..d2701bf35c 100644
--- a/send-pack.c
+++ b/send-pack.c
@@ -85,6 +85,7 @@ static int pack_objects(int fd, struct ref *refs, struct oid_array *extra, struc
po.in = -1;
po.out = args->stateless_rpc ? -1 : fd;
po.git_cmd = 1;
+ po.clean_on_exit = 1;
if (start_command(&po))
die_errno("git pack-objects failed");