Merge branch 'fixes'

diff --git a/daemon.c b/daemon.c
index 693af515d3f007985ab512695251d2cac17f13a2..bd278b01c11ed831623e3c6db111f53c2e08d050 100644 (file)
--- a/daemon.c
+++ b/daemon.c
@@ -148,7 +148,7 @@ static int set_dir(const char *dir)
        /*
         * Security on the cheap.
         *
-        * We want a readable HEAD, usable "objects" directory, and 
+        * We want a readable HEAD, usable "objects" directory, and
         * a "git-daemon-export-ok" flag that says that the other side
         * is ok with us doing this.
         */
@@ -491,7 +491,7 @@ static int serve(int port)
        for (;;) {
                int i;
                fds = fds_init;
-               
+
                if (select(maxfd + 1, &fds, NULL, NULL, NULL) < 0) {
                        if (errno != EINTR) {
                                error("select failed, resuming: %s",
@@ -562,7 +562,7 @@ int main(int argc, char **argv)
                if (!strncmp(arg, "--timeout=", 10)) {
                        timeout = atoi(arg+10);
                }
-               if (!strncmp(arg, "--init-timeout=", 10)) {
+               if (!strncmp(arg, "--init-timeout=", 15)) {
                        init_timeout = atoi(arg+15);
                }
                if (!strcmp(arg, "--")) {