diff options
author | Brandon Williams <bmwill@google.com> | 2017-06-12 15:13:54 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-06-13 11:40:51 -0700 |
commit | d6c41c20e688a1b284b92d92320ba56f639688de (patch) | |
tree | 1ef198c6b461be52fc41d3aee78a94328127e9a4 /convert.c | |
parent | 49a6d31fc8c4277b1c5f5b82331e7190afa1d4ce (diff) | |
download | git-d6c41c20e688a1b284b92d92320ba56f639688de.tar.gz |
convert: convert convert_to_git_filter_fd to take an index
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'convert.c')
-rw-r--r-- | convert.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1108,7 +1108,8 @@ int convert_to_git(const char *path, const char *src, size_t len, return ret | ident_to_git(path, src, len, dst, ca.ident); } -void convert_to_git_filter_fd(const char *path, int fd, struct strbuf *dst, +void convert_to_git_filter_fd(const struct index_state *istate, + const char *path, int fd, struct strbuf *dst, enum safe_crlf checksafe) { struct conv_attrs ca; @@ -1120,7 +1121,7 @@ void convert_to_git_filter_fd(const char *path, int fd, struct strbuf *dst, if (!apply_filter(path, NULL, 0, fd, dst, ca.drv, CAP_CLEAN)) die("%s: clean filter '%s' failed", path, ca.drv->name); - crlf_to_git(&the_index, path, dst->buf, dst->len, dst, ca.crlf_action, checksafe); + crlf_to_git(istate, path, dst->buf, dst->len, dst, ca.crlf_action, checksafe); ident_to_git(path, dst->buf, dst->len, dst, ca.ident); } |