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>

diff --git a/convert.h b/convert.h
index 0c2143c152734feb3bdc7ba44b61b8327f02881c..c638b33632f5fe0398aed7da72fb3b157ff222cd 100644 (file)
--- a/convert.h
+++ b/convert.h
@@ -40,10 +40,9 @@ 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);
                                   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, const char *src,
-                                      size_t len, enum safe_crlf checksafe)
+static inline int would_convert_to_git(const char *path)

 {
 {

-       return convert_to_git(path, src, len, NULL, checksafe);
+       return convert_to_git(path, NULL, 0, NULL, 0);

 }
 
 /*****************************************************************
 }
 
 /*****************************************************************

diff --git a/sha1_file.c b/sha1_file.c
index 3f70b1d86aaa8e0648d8a3c6ebb6aca701ae7475..00c07f233bc9f98ff5d46f752e73318e0585f20a 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -3144,7 +3144,7 @@ int index_fd(unsigned char *sha1, int fd, struct stat *st,
        if (!S_ISREG(st->st_mode))
                ret = index_pipe(sha1, fd, type, path, flags);
        else if (size <= big_file_threshold || type != OBJ_BLOB ||
        if (!S_ISREG(st->st_mode))
                ret = index_pipe(sha1, fd, type, path, flags);
        else if (size <= big_file_threshold || type != OBJ_BLOB ||

-                (path && would_convert_to_git(path, NULL, 0, 0)))
+                (path && would_convert_to_git(path)))

                ret = index_core(sha1, fd, size, type, path, flags);
        else
                ret = index_stream(sha1, fd, size, type, path, flags);
                ret = index_core(sha1, fd, size, type, path, flags);
        else
                ret = index_stream(sha1, fd, size, type, path, flags);