From: Ramkumar Ramachandra <artagnon@gmail.com>
Date: Tue, 15 Nov 2011 16:59:39 +0000 (+0530)
Subject: sha1_file: don't mix enum with int
X-Git-Tag: v1.7.8-rc4~9^2~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5e12e78e52b4219ce27c14404351648fd47854cc;p=git.git

sha1_file: don't mix enum with int

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/sha1_file.c b/sha1_file.c
index 27f3b9b27..6dcae3882 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2616,7 +2616,7 @@ static int index_mem(unsigned char *sha1, void *buf, size_t size,
 	if ((type == OBJ_BLOB) && path) {
 		struct strbuf nbuf = STRBUF_INIT;
 		if (convert_to_git(path, buf, size, &nbuf,
-		                   write_object ? safe_crlf : 0)) {
+				   write_object ? safe_crlf : SAFE_CRLF_FALSE)) {
 			buf = strbuf_detach(&nbuf, &size);
 			re_allocated = 1;
 		}