On Fri, Apr 01, 2011 at 11:41:12AM +0200, Erik Faye-Lund wrote:
On Thu, Mar 31, 2011 at 8:45 PM, Jeff King [off-list ref] wrote:
quoted
We just need to cancel the thread, instead of sending it a
signal as we do for fork()'d async sections.
Signed-off-by: Jeff King <redacted>
---
This could also just be part of the merge resolution, but I thought it
would be easier to see what is going on if I put it here.
run-command.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/run-command.c b/run-command.c
index e31c073..46ea07d 100644
--- a/run-command.c
+++ b/run-command.c
@@ -607,7 +607,7 @@ void abort_async(struct async *async)
#ifdef NO_PTHREADS
This context-line doesn't match 3/4... Did you send out the wrong
version of that patch?
No, read the cover letter. After 4/4, you have to merge the fix up to a
more modern version with pthreads, then this goes on top of the
resolution.
-Peff