convert: drop arguments other than 'path' from would_convert_to_git()
It is only the path that matters in the decision whether to filter or not. Clarify this by making path the only argument of would_convert_to_git(). Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Steffen Prohaska committed
Aug 21, 2014 at 18:05 UTC
7ce7c7607b14248b1a3ae7cdd1c079eb3b6efa09
2 files changed
+3
-4
convert.h
+2
-3
@@ -40,10 +40,9 @@ extern int convert_to_working_tree(const char *path, const char *src,
40
size_t len, struct strbuf *dst);
41
extern int renormalize_buffer(const char *path, const char *src, size_t len,
42
struct strbuf *dst);
43
-static inline int would_convert_to_git(const char *path, const char *src,
44
- size_t len, enum safe_crlf checksafe)
43
+static inline int would_convert_to_git(const char *path)
44
{
46
- return convert_to_git(path, src, len, NULL, checksafe);
45
+ return convert_to_git(path, NULL, 0, NULL, 0);
46
}
47
48
/*****************************************************************
sha1_file.c
+1
-1
@@ -3144,7 +3144,7 @@ int index_fd(unsigned char *sha1, int fd, struct stat *st,
3144
if (!S_ISREG(st->st_mode))
3145
ret = index_pipe(sha1, fd, type, path, flags);
3146
else if (size <= big_file_threshold || type != OBJ_BLOB ||
3147
- (path && would_convert_to_git(path, NULL, 0, 0)))
3147
+ (path && would_convert_to_git(path)))
3148
ret = index_core(sha1, fd, size, type, path, flags);
3149
else
3150
ret = index_stream(sha1, fd, size, type, path, flags);