diff options
| author | Steffen Prohaska <prohaska@zib.de> | 2014-08-21 18:05:08 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-08-21 15:27:20 -0700 |
| commit | 7ce7c7607b14248b1a3ae7cdd1c079eb3b6efa09 (patch) | |
| tree | 739246ff07944defd49afcd783734f24b10c4c0e | |
| parent | 6c4ab27f2378ce67940b4496365043119d7ffff2 (diff) | |
| download | git-7ce7c7607b14248b1a3ae7cdd1c079eb3b6efa09.tar.gz | |
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>
| -rw-r--r-- | convert.h | 5 | ||||
| -rw-r--r-- | sha1_file.c | 2 |
2 files changed, 3 insertions, 4 deletions
@@ -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); -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 3f70b1d86a..00c07f233b 100644 --- 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 || - (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); |