summaryrefslogtreecommitdiff
path: root/convert.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-09 19:52:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-09 21:58:52 (GMT)
commitec70f52f6fb6d3e08c7b24f8b5bf25502d8ee59b (patch)
tree7345be535b44a0f7e50fb863fadf2107b9822ff0 /convert.c
parent4e3aa87d13b339fa678cd3cb7f23664d3a48fb21 (diff)
downloadgit-ec70f52f6fb6d3e08c7b24f8b5bf25502d8ee59b.zip
git-ec70f52f6fb6d3e08c7b24f8b5bf25502d8ee59b.tar.gz
git-ec70f52f6fb6d3e08c7b24f8b5bf25502d8ee59b.tar.bz2
convert: rename the "eol" global variable to "core_eol"
Yes, it is clear that "eol" wants to mean some sort of end-of-line thing, but as the name of a global variable, it is way too short to describe what kind of end-of-line thing it wants to represent. Besides, there are many codepaths that want to use their own local "char *eol" variable to point at the end of the current line they are processing. This global variable holds what we read from core.eol configuration variable. Name it as such. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'convert.c')
-rw-r--r--convert.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/convert.c b/convert.c
index 7eb51b1..4dba329 100644
--- a/convert.c
+++ b/convert.c
@@ -113,10 +113,10 @@ static enum eol determine_output_conversion(enum action action)
return EOL_CRLF;
else if (auto_crlf == AUTO_CRLF_INPUT)
return EOL_LF;
- else if (eol == EOL_UNSET)
+ else if (core_eol == EOL_UNSET)
return EOL_NATIVE;
}
- return eol;
+ return core_eol;
}
static void check_safe_crlf(const char *path, enum action action,