sha1_file: don't mix enum with int

artagnon · gitster · commit 5e12e78e52b4 · 2011-11-15T16:09:20.000-08:00
Signed-off-by: Ramkumar Ramachandra &lt;artagnon@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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;
 		}

Original file line number	Diff line number	Diff line change
`@@ -2616,7 +2616,7 @@ static int index_mem(unsigned char sha1, void buf, size_t size,`
`2616`	`2616`	`if ((type == OBJ_BLOB) && path) {`
`2617`	`2617`	`struct strbuf nbuf = STRBUF_INIT;`
`2618`	`2618`	`if (convert_to_git(path, buf, size, &nbuf,`
`2619`		`- write_object ? safe_crlf : 0)) {`
	`2619`	`+ write_object ? safe_crlf : SAFE_CRLF_FALSE)) {`
`2620`	`2620`	`buf = strbuf_detach(&nbuf, &size);`
`2621`	`2621`	`re_allocated = 1;`
`2622`	`2622`	`}`