summaryrefslogtreecommitdiff
path: root/git-difftool.perl
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-04-29 12:59:08 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-04-29 12:59:08 -0700
commitd689301043f6dc14d71e7d33e1b8ea600ae1b67b (patch)
treede02603666c3fee3c3c1f93b826c27d020d40f1c /git-difftool.perl
parentMerge branch 'js/replace-edit-use-editor-configuration' (diff)
parentt5504: drop sigpipe=ok from push tests (diff)
downloadtgif-d689301043f6dc14d71e7d33e1b8ea600ae1b67b.tar.xz
Merge branch 'jk/push-client-deadlock-fix'
"git push" from a corrupt repository that attempts to push a large number of refs deadlocked; the thread to relay rejection notices for these ref updates blocked on writing them to the main thread, after the main thread at the receiving end notices that the push failed and decides not to read these notices and return a failure. * jk/push-client-deadlock-fix: t5504: drop sigpipe=ok from push tests fetch-pack: isolate sigpipe in demuxer thread send-pack: isolate sigpipe in demuxer thread run-command: teach async threads to ignore SIGPIPE send-pack: close demux pipe before finishing async process
Diffstat (limited to 'git-difftool.perl')
0 files changed, 0 insertions, 0 deletions