Merge branch 'jk/common-main-2.8' into jk/common-main

diff --git a/t/helper/test-regex.c b/t/helper/test-regex.c
index 0dc598ecdc2696af956b1c517166f9e28b37dc68..37b7f06e552ef51c852f54e70d66c434ca50b6b2 100644 (file)
--- a/t/helper/test-regex.c
+++ b/t/helper/test-regex.c
@@ -1,6 +1,6 @@
 #include "git-compat-util.h"
 
-int main(int argc, char **argv)
+int cmd_main(int argc, const char **argv)
 {
        char *pat = "[^={} \t]+";
        char *str = "={}\nfred";