|
@@ -127,6 +127,25 @@
|
127
|
127
|
{
|
128
|
128
|
int listen_port = 0;
|
129
|
129
|
struct string_list listen_addr = STRING_LIST_INIT_NODUP;
|
|
130
|
+@@ -1315,12 +1315,13 @@
|
|
131
|
+ store_pid(pid_file);
|
|
132
|
+
|
|
133
|
+ /* prepare argv for serving-processes */
|
|
134
|
+- cld_argv = xmalloc(sizeof (char *) * (argc + 2));
|
|
135
|
+- cld_argv[0] = argv[0]; /* git-daemon */
|
|
136
|
+- cld_argv[1] = "--serve";
|
|
137
|
++ cld_argv = xmalloc(sizeof (char *) * (argc + 3));
|
|
138
|
++ cld_argv[0] = "git";
|
|
139
|
++ cld_argv[1] = argv[0]; /* daemon */
|
|
140
|
++ cld_argv[2] = "--serve";
|
|
141
|
+ for (i = 1; i < argc; ++i)
|
|
142
|
+- cld_argv[i+1] = argv[i];
|
|
143
|
+- cld_argv[argc+1] = NULL;
|
|
144
|
++ cld_argv[i+2] = argv[i];
|
|
145
|
++ cld_argv[argc+2] = NULL;
|
|
146
|
+
|
|
147
|
+ return serve(&listen_addr, listen_port, cred);
|
|
148
|
+ }
|
130
|
149
|
--- a/fast-import.c
|
131
|
150
|
+++ b/fast-import.c
|
132
|
151
|
@@ -3343,7 +3343,7 @@ static void parse_argv(void)
|