summaryrefslogtreecommitdiff
path: root/sha1_file.c
diff options
context:
space:
mode:
authorRamkumar Ramachandra <artagnon@gmail.com>2011-11-15 16:59:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-11-16 00:09:20 (GMT)
commit5e12e78e52b4219ce27c14404351648fd47854cc (patch)
tree3f81ffff3c412cbf31ab9e8af36f54d3566f6c05 /sha1_file.c
parent7356b51e4bd07893256d76468d301dc244f4299d (diff)
downloadgit-5e12e78e52b4219ce27c14404351648fd47854cc.zip
git-5e12e78e52b4219ce27c14404351648fd47854cc.tar.gz
git-5e12e78e52b4219ce27c14404351648fd47854cc.tar.bz2
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>
Diffstat (limited to 'sha1_file.c')
-rw-r--r--sha1_file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sha1_file.c b/sha1_file.c
index 27f3b9b..6dcae38 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;
}