summaryrefslogtreecommitdiff
path: root/sub-process.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-08-24 10:20:02 -0700
committerJunio C Hamano <gitster@pobox.com>2017-08-24 10:20:02 -0700
commitd1615f93aca8e0380022066910701aaab29c690e (patch)
tree9026abf828c7b340c13176202dc10e29ce1a49d5 /sub-process.c
parent11bd95604ab6ebc8c2edf7db4dccb33c7659890b (diff)
parentd3ba566342a4fd81b24d926efc35506d58e10a19 (diff)
downloadgit-d1615f93aca8e0380022066910701aaab29c690e.tar.gz
Merge branch 'cc/subprocess-handshake-missing-capabilities'
When handshake with a subprocess filter notices that the process asked for an unknown capability, Git did not report what program the offending subprocess was running. This has been corrected. * cc/subprocess-handshake-missing-capabilities: sub-process: print the cmd when a capability is unsupported
Diffstat (limited to 'sub-process.c')
-rw-r--r--sub-process.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sub-process.c b/sub-process.c
index 6edb97c1c6..6ccfaaba99 100644
--- 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);
+ warning("subprocess '%s' requested unsupported capability '%s'",
+ process->argv[0], p);
}
}