rename git-p4 tests

diff --git a/sha1_file.c b/sha1_file.c
index c96e366b765f645f3eead72b952d6dc7fe2fef00..f291f3f0f7d919c7d59b8b7dc3c3f2450a5a9f09 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1268,7 +1268,8 @@ unsigned long unpack_object_header_buffer(const unsigned char *buf,
        while (c & 0x80) {
                if (len <= used || bitsizeof(long) <= shift) {
                        error("bad object header");
-                       return 0;
+                       size = used = 0;
+                       break;
                }
                c = buf[used++];
                size += (c & 0x7f) << shift;
@@ -2617,7 +2618,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;
                }