summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-08-25 21:42:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-08-25 21:42:32 (GMT)
commita103ad6f3d58cf3d297a6b102876e2bbf09c98d7 (patch)
tree763c63d41c7c3d9fadf0ebbe76e9fc90f81743a8 /Makefile
parent098b7bfaa6c415f2b23885b82d6b5a31a8cdb7d2 (diff)
parent716c1f649e372a0784b9826cd3839e7b373e2ea9 (diff)
downloadgit-a103ad6f3d58cf3d297a6b102876e2bbf09c98d7.zip
git-a103ad6f3d58cf3d297a6b102876e2bbf09c98d7.tar.gz
git-a103ad6f3d58cf3d297a6b102876e2bbf09c98d7.tar.bz2
Merge branch 'jk/pipe-command-nonblock'
Fix deadlocks between main Git process and subprocess spawned via the pipe_command() API, that can kill "git add -p" that was reimplemented in C recently. * jk/pipe-command-nonblock: pipe_command(): mark stdin descriptor as non-blocking pipe_command(): handle ENOSPC when writing to a pipe pipe_command(): avoid xwrite() for writing to pipe git-compat-util: make MAX_IO_SIZE define globally available nonblock: support Windows compat: add function to enable nonblocking pipes
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index e8adeb0..224e193 100644
--- a/Makefile
+++ b/Makefile
@@ -918,6 +918,7 @@ LIB_OBJS += combine-diff.o
LIB_OBJS += commit-graph.o
LIB_OBJS += commit-reach.o
LIB_OBJS += commit.o
+LIB_OBJS += compat/nonblock.o
LIB_OBJS += compat/obstack.o
LIB_OBJS += compat/terminal.o
LIB_OBJS += compat/zlib-uncompress2.o