sha1_file: don't mix enum with int
authorRamkumar Ramachandra <artagnon@gmail.com>
Tue, 15 Nov 2011 16:59:39 +0000 (22:29 +0530)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Nov 2011 00:09:20 +0000 (16:09 -0800)
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
sha1_file.c
index 27f3b9b278a97f66f92ca61a2bc39e30f0a70317..6dcae3882bf969cce9ae0a973a80abf76e3bb814 100644 (file)
@@ -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,
        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;
                }
                        buf = strbuf_detach(&nbuf, &size);
                        re_allocated = 1;
                }