Merge branch 'cc/subprocess-handshake-missing-capabilities'
authorJunio C Hamano <gitster@pobox.com>
Thu, 24 Aug 2017 17:20:02 +0000 (10:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 24 Aug 2017 17:20:02 +0000 (10:20 -0700)
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

1  2 
sub-process.c

diff --combined sub-process.c
@@@ -6,13 -6,10 +6,13 @@@
  #include "pkt-line.h"
  
  int cmd2process_cmp(const void *unused_cmp_data,
 -                  const struct subprocess_entry *e1,
 -                  const struct subprocess_entry *e2,
 +                  const void *entry,
 +                  const void *entry_or_key,
                    const void *unused_keydata)
  {
 +      const struct subprocess_entry *e1 = entry;
 +      const struct subprocess_entry *e2 = entry_or_key;
 +
        return strcmp(e1->cmd, e2->cmd);
  }
  
@@@ -184,8 -181,8 +184,8 @@@ static int handshake_capabilities(struc
                        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);
                }
        }