summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-11-21 19:03:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-11-21 19:03:20 (GMT)
commit0f64a5a3a25c9a161c4e70ae031c885a6284ddb8 (patch)
treee89ea6181133513b8022ccc901a494bd12faef7a
parent05bab3ea283d687d7981583aa87e03279f3b1484 (diff)
parentef563de6dd6997b913d5c87f6caf09db7e44bdcd (diff)
downloadgit-0f64a5a3a25c9a161c4e70ae031c885a6284ddb8.zip
git-0f64a5a3a25c9a161c4e70ae031c885a6284ddb8.tar.gz
git-0f64a5a3a25c9a161c4e70ae031c885a6284ddb8.tar.bz2
Merge branch 'rr/misc-fixes'
* rr/misc-fixes: convert.c: Fix return type of git_path_check_eol()
-rw-r--r--convert.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/convert.c b/convert.c
index 038b0be..86e9c29 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;