diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-10 17:02:55 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-10 17:02:55 +0900 |
| commit | 27015b4f95cddd51172a8b12a05fd68f4477bdfb (patch) | |
| tree | a0ea0b06fc9e0d856fa85fc01d7732f110cd40ba | |
| parent | f1b64e8e649566971a4b55122d72f0f1d07047d1 (diff) | |
| parent | d3ba566342a4fd81b24d926efc35506d58e10a19 (diff) | |
| download | git-27015b4f95cddd51172a8b12a05fd68f4477bdfb.tar.gz | |
Merge branch 'cc/subprocess-handshake-missing-capabilities' into maint
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.
We may want a follow-up fix to tighten the error checking, though.
* cc/subprocess-handshake-missing-capabilities:
sub-process: print the cmd when a capability is unsupported
| -rw-r--r-- | sub-process.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sub-process.c b/sub-process.c index 86de8d7bfb..fcc4832c14 100644 --- a/sub-process.c +++ b/sub-process.c @@ -181,8 +181,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); } } |