From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 21 Nov 2011 19:03:20 +0000 (-0800)
Subject: Merge branch 'rr/misc-fixes'
X-Git-Tag: v1.7.8-rc4~9
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0f64a5a3a25c9a161c4e70ae031c885a6284ddb8;hp=05bab3ea283d687d7981583aa87e03279f3b1484;p=git.git

Merge branch 'rr/misc-fixes'

* rr/misc-fixes:
  convert.c: Fix return type of git_path_check_eol()
---

diff --git a/convert.c b/convert.c
index 038b0be61..86e9c29ec 100644
--- a/convert.c
+++ b/convert.c
@@ -658,7 +658,7 @@ static enum crlf_action git_path_check_crlf(const char *path, struct git_attr_ch
 	return CRLF_GUESS;
 }
 
-static enum crlf_action git_path_check_eol(const char *path, struct git_attr_check *check)
+static enum eol git_path_check_eol(const char *path, struct git_attr_check *check)
 {
 	const char *value = check->value;