summaryrefslogtreecommitdiff
path: root/convert.h
diff options
context:
space:
mode:
Diffstat (limited to 'convert.h')
-rw-r--r--convert.h15
1 files changed, 11 insertions, 4 deletions
diff --git a/convert.h b/convert.h
index 82871a11d5..97d427296f 100644
--- a/convert.h
+++ b/convert.h
@@ -39,19 +39,26 @@ extern const char *get_convert_attr_ascii(const char *path);
/* returns 1 if *dst was used */
extern int convert_to_git(const char *path, const char *src, size_t len,
- struct strbuf *dst, enum safe_crlf checksafe);
+ struct strbuf *dst, enum safe_crlf checksafe,
+ const unsigned char *index_blob_sha1);
+
extern int convert_to_working_tree(const char *path, const char *src,
size_t len, struct strbuf *dst);
extern int renormalize_buffer(const char *path, const char *src, size_t len,
struct strbuf *dst);
-static inline int would_convert_to_git(const char *path)
+static inline int would_convert_to_git(const char *path,
+ const unsigned char *index_blob_sha1)
{
- return convert_to_git(path, NULL, 0, NULL, 0);
+ return convert_to_git(path, NULL, 0, NULL, SAFE_CRLF_FALSE,
+ index_blob_sha1);
}
+
/* Precondition: would_convert_to_git_filter_fd(path) == true */
extern void convert_to_git_filter_fd(const char *path, int fd,
struct strbuf *dst,
- enum safe_crlf checksafe);
+ enum safe_crlf checksafe,
+ const unsigned char *index_blob_sha1);
+
extern int would_convert_to_git_filter_fd(const char *path);
/*****************************************************************