diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-02-13 21:39:08 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-13 21:39:08 (GMT) |
| commit | 9bc89b17e36db31a54bc3ff16e48b5cb6beb095b (patch) | |
| tree | 160acf5d402bc4a638fbaa5ad7d16dc228e08f88 /sha1_file.c | |
| parent | 8fe806bcd5ac621e22982c73306e94d26e56cf79 (diff) | |
| parent | 8462ff43e42ab67cecd16fdfb59451a53cc8a945 (diff) | |
| download | git-9bc89b17e36db31a54bc3ff16e48b5cb6beb095b.zip git-9bc89b17e36db31a54bc3ff16e48b5cb6beb095b.tar.gz git-9bc89b17e36db31a54bc3ff16e48b5cb6beb095b.tar.bz2 | |
Merge branch 'tb/crlf-conv-flags'
Code clean-up.
* tb/crlf-conv-flags:
convert_to_git(): safe_crlf/checksafe becomes int conv_flags
Diffstat (limited to 'sha1_file.c')
| -rw-r--r-- | sha1_file.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sha1_file.c b/sha1_file.c index 90998bb..4d3f282 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -133,14 +133,14 @@ static struct cached_object *find_cached_object(const unsigned char *sha1) } -static enum safe_crlf get_safe_crlf(unsigned flags) +static int get_conv_flags(unsigned flags) { if (flags & HASH_RENORMALIZE) - return SAFE_CRLF_RENORMALIZE; + return CONV_EOL_RENORMALIZE; else if (flags & HASH_WRITE_OBJECT) - return safe_crlf; + return global_conv_flags_eol; else - return SAFE_CRLF_FALSE; + return 0; } @@ -1767,7 +1767,7 @@ static int index_mem(struct object_id *oid, void *buf, size_t size, if ((type == OBJ_BLOB) && path) { struct strbuf nbuf = STRBUF_INIT; if (convert_to_git(&the_index, path, buf, size, &nbuf, - get_safe_crlf(flags))) { + get_conv_flags(flags))) { buf = strbuf_detach(&nbuf, &size); re_allocated = 1; } @@ -1801,7 +1801,7 @@ static int index_stream_convert_blob(struct object_id *oid, int fd, assert(would_convert_to_git_filter_fd(path)); convert_to_git_filter_fd(&the_index, path, fd, &sbuf, - get_safe_crlf(flags)); + get_conv_flags(flags)); if (write_object) ret = write_sha1_file(sbuf.buf, sbuf.len, typename(OBJ_BLOB), |