From: Junio C Hamano <junkio@cox.net>
Date: Fri, 21 Oct 2005 06:19:47 +0000 (-0700)
Subject: Merge branch 'fixes'
X-Git-Tag: v0.99.8g~2
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/f6804930cae3ccf48b200264bdb7a25b4382d454?hp=147a1ab03599c21c9e5972739c460fd2635c0c02

Merge branch 'fixes'
---

diff --git a/daemon.c b/daemon.c
index 8bb4d913bd..bd278b01c1 100644
--- 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",