diff options
| author | Andreas Rohner <andreas.rohner@gmx.net> | 2014-08-02 16:40:34 +0200 |
|---|---|---|
| committer | Andreas Rohner <andreas.rohner@gmx.net> | 2014-09-03 02:14:53 +0200 |
| commit | 19f3a40faea0b5962ccba0d7581853b49ae51675 (patch) | |
| tree | 4161898a77b748ed2f220d539a58e8f06ad6ad42 /net/git/patches | |
| parent | 3a78fe047ab26879cf471df69e29faa183b726bb (diff) | |
Fix bug in git-daemon
The git-daemon command currently doesn't work and displays the following
error whenever a repository is cloned:
error: cannot run daemon: No such file or directory
[10920] unable to fork
On the client side the connection is simply terminated. The problem is,
that git-daemon tries to start a new instance of itself for every
new client that is connecting. It expects argv[0] to contain
"git-daemon", but since it is converted into a builtin command, argv[0]
only contains "daemon", which does not exist and causes the above error.
The fix simply prepends "git" to the list of arguments, so that the
resulting call looks something like "git daemon --serve ..."
Signed-off-by: Andreas Rohner <andreas.rohner@gmx.net>
Diffstat (limited to 'net/git/patches')
| -rw-r--r-- | net/git/patches/100-convert_builtin.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/net/git/patches/100-convert_builtin.patch b/net/git/patches/100-convert_builtin.patch index 60cffda85..e883921e5 100644 --- a/net/git/patches/100-convert_builtin.patch +++ b/net/git/patches/100-convert_builtin.patch @@ -127,6 +127,25 @@ { int listen_port = 0; struct string_list listen_addr = STRING_LIST_INIT_NODUP; +@@ -1315,12 +1315,13 @@ + store_pid(pid_file); + + /* prepare argv for serving-processes */ +- cld_argv = xmalloc(sizeof (char *) * (argc + 2)); +- cld_argv[0] = argv[0]; /* git-daemon */ +- cld_argv[1] = "--serve"; ++ cld_argv = xmalloc(sizeof (char *) * (argc + 3)); ++ cld_argv[0] = "git"; ++ cld_argv[1] = argv[0]; /* daemon */ ++ cld_argv[2] = "--serve"; + for (i = 1; i < argc; ++i) +- cld_argv[i+1] = argv[i]; +- cld_argv[argc+1] = NULL; ++ cld_argv[i+2] = argv[i]; ++ cld_argv[argc+2] = NULL; + + return serve(&listen_addr, listen_port, cred); + } --- a/fast-import.c +++ b/fast-import.c @@ -3343,7 +3343,7 @@ static void parse_argv(void) |