Merge branch 'ar/chmod-series' into next

diff --git a/upload-pack.c b/upload-pack.c
index 635abb371d4c86677f091551f731047b4ca08612..47560c9527b9c17db34f10e78d7c1f0d99b746e1 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -46,7 +46,7 @@ static void create_pack_file(void)
        if (!pid) {
                int i;
                int args;
-               char **argv;
+               const char **argv;
                char *buf;
                char **p;
 
@@ -56,9 +56,9 @@ static void create_pack_file(void)
                }
                else
                        args = nr_has + nr_needs + 5;
-               argv = xmalloc(args * sizeof(char *));
+               p = xmalloc(args * sizeof(char *));
+               argv = (const char **) p;
                buf = xmalloc(args * 45);
-               p = argv;
 
                dup2(fd[1], 1);
                close(0);