Merge branch 'jk/no-optional-locks'

diff --git a/sub-process.c b/sub-process.c
index 6edb97c1c68c063216bda710d5880b1d08de27da..6dde5062bef388fcdd3db10d9af19f8ffc7f7d6f 100644 (file)
--- a/sub-process.c
+++ b/sub-process.c
@@ -184,8 +184,8 @@ static int handshake_capabilities(struct child_process *process,
                        if (supported_capabilities)
                                *supported_capabilities |= capabilities[i].flag;
                } else {
-                       warning("external filter requested unsupported filter capability '%s'",
-                               p);
+                       die("subprocess '%s' requested unsupported capability '%s'",
+                           process->argv[0], p);
                }
        }