Merge branch 'fc/fetch-with-import-fix' into maint

diff --git a/sub-process.h b/sub-process.h
index 49701998c9bd663073244e64c4edd7e80991a3ef..5c182fad98539eecd1b23edadebf369eb21f353b 100644 (file)
--- a/sub-process.h
+++ b/sub-process.h
@@ -42,10 +42,10 @@ struct subprocess_capability {
 /* subprocess functions */
 
 /* Function to test two subprocess hashmap entries for equality. */
-extern int cmd2process_cmp(const void *unused_cmp_data,
-                          const void *e1,
-                          const void *e2,
-                          const void *unused_keydata);
+int cmd2process_cmp(const void *unused_cmp_data,
+                   const void *e1,
+                   const void *e2,
+                   const void *unused_keydata);
 
 /*
  * User-supplied function to initialize the sub-process.  This is
@@ -73,8 +73,8 @@ static inline struct child_process *subprocess_get_child_process(
 }
 
 /*
- * Perform the version and capability negotiation as described in the "Long
- * Running Filter Process" section of the gitattributes documentation using the
+ * Perform the version and capability negotiation as described in the
+ * "Handshake" section of long-running-process-protocol.txt using the
  * given requested versions and capabilities. The "versions" and "capabilities"
  * parameters are arrays terminated by a 0 or blank struct.
  *