GIT 0.99.9cv0.99.9c

Signed-off-by: Junio C Hamano <junkio@cox.net>

1 files changed, 8 insertions, 0 deletions

diff --git a/config.c b/config.c
index 519fecfee4..e89bab26c9 100644
--- a/config.c
+++ b/config.c
@@ -13,6 +13,14 @@ static int get_next_char(void)
 	c = '\n';
 	if ((f = config_file) != NULL) {
 		c = fgetc(f);
+		if (c == '\r') {
+			/* DOS like systems */
+			c = fgetc(f);
+			if (c != '\n') {
+				ungetc(c, f);
+				c = '\r';
+			}
+		}
 		if (c == '\n')
 			config_linenr++;
 		if (c == EOF) {