Merge branch 'ml/worktree'

diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
index c95e477e831dd436f074bbca9b2b9ca5ad5a5eb1..489c2c58c01514ac3d967d1c3f46f1243f853580 100644 (file)
--- a/builtin-mailinfo.c
+++ b/builtin-mailinfo.c
@@ -851,8 +851,8 @@ static void handle_info(void)
        fprintf(fout, "\n");
 }
 
-int mailinfo(FILE *in, FILE *out, int ks, const char *encoding,
-            const char *msg, const char *patch)
+static int mailinfo(FILE *in, FILE *out, int ks, const char *encoding,
+                   const char *msg, const char *patch)
 {
        keep_subject = ks;
        metainfo_charset = encoding;