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>
This commit is contained in:
parent
49a6d31fc8
commit
d6c41c20e6
@ -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);
|
||||
}
|
||||
|
||||
|
@ -52,7 +52,8 @@ static inline int would_convert_to_git(const char *path)
|
||||
return convert_to_git(path, NULL, 0, NULL, 0);
|
||||
}
|
||||
/* Precondition: would_convert_to_git_filter_fd(path) == true */
|
||||
extern void convert_to_git_filter_fd(const char *path, int fd,
|
||||
extern void convert_to_git_filter_fd(const struct index_state *istate,
|
||||
const char *path, int fd,
|
||||
struct strbuf *dst,
|
||||
enum safe_crlf checksafe);
|
||||
extern int would_convert_to_git_filter_fd(const char *path);
|
||||
|
@ -3580,7 +3580,7 @@ static int index_stream_convert_blob(unsigned char *sha1, int fd,
|
||||
assert(path);
|
||||
assert(would_convert_to_git_filter_fd(path));
|
||||
|
||||
convert_to_git_filter_fd(path, fd, &sbuf,
|
||||
convert_to_git_filter_fd(&the_index, path, fd, &sbuf,
|
||||
write_object ? safe_crlf : SAFE_CRLF_FALSE);
|
||||
|
||||
if (write_object)
|
||||
|
Loading…
Reference in New Issue
Block a user