t/t5515-fetch-merge-logic.sh: Added tests for the merge login in git-fetch

diff --git a/quote.h b/quote.h
index 50ce1df976671b5e9fac83368ae5ea28211a432a..bdc3610df51000baeda49da1eeaec20ccb2682fb 100644 (file)
--- a/quote.h
+++ b/quote.h
@@ -2,6 +2,7 @@
 #define QUOTE_H
 
 #include <stddef.h>
+#include <stdio.h>
 
 /* Help to copy the thing properly quoted for the shell safety.
  * any single quote is replaced with '\'', any exclamation point
@@ -27,7 +28,33 @@
  * excluding the final null regardless of the buffer size.
  */
 
-char *sq_quote(const char *src);
-size_t sq_quote_buf(char *dst, size_t n, const char *src);
+extern char *sq_quote(const char *src);
+extern void sq_quote_print(FILE *stream, const char *src);
+extern size_t sq_quote_buf(char *dst, size_t n, const char *src);
+extern char *sq_quote_argv(const char** argv, int count);
+
+/*
+ * Append a string to a string buffer, with or without shell quoting.
+ * Return true if the buffer overflowed.
+ */
+extern int add_to_string(char **ptrp, int *sizep, const char *str, int quote);
+
+/* This unwraps what sq_quote() produces in place, but returns
+ * NULL if the input does not look like what sq_quote would have
+ * produced.
+ */
+extern char *sq_dequote(char *);
+
+extern int quote_c_style(const char *name, char *outbuf, FILE *outfp,
+                        int nodq);
+extern char *unquote_c_style(const char *quoted, const char **endp);
+
+extern void write_name_quoted(const char *prefix, int prefix_len,
+                             const char *name, int quote, FILE *out);
+
+/* quoting as a string literal for other languages */
+extern void perl_quote_print(FILE *stream, const char *src);
+extern void python_quote_print(FILE *stream, const char *src);
+extern void tcl_quote_print(FILE *stream, const char *src);
 
 #endif