From: Steffen Prohaska <prohaska@zib.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, peff@peff.net, schacon@gmail.com,
Steffen Prohaska <prohaska@zib.de>
Subject: [PATCH v2 1/2] convert: Refactor would_convert_to_git() to single arg 'path'
Date: Wed, 6 Aug 2014 07:32:13 +0200 [thread overview]
Message-ID: <1407303134-16635-2-git-send-email-prohaska@zib.de> (raw)
In-Reply-To: <1407303134-16635-1-git-send-email-prohaska@zib.de>
It is only the path that matters in the decision whether to filter or
not. Clarify this by making path the single argument of
would_convert_to_git().
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
---
convert.h | 5 ++---
sha1_file.c | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/convert.h b/convert.h
index 0c2143c..c638b33 100644
--- 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);
-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 3f70b1d..00c07f2 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);
--
2.1.0.rc1.6.gb569bd8
next prev parent reply other threads:[~2014-08-06 5:32 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-06 5:32 [PATCH v2 0/2] Stream fd to clean filter Steffen Prohaska
2014-08-06 5:32 ` Steffen Prohaska [this message]
2014-08-06 5:32 ` [PATCH v2 2/2] convert: Stream from fd to required clean filter instead of mmap Steffen Prohaska
2014-08-16 10:27 ` John Keeping
2014-08-16 16:26 ` Steffen Prohaska
2014-08-16 17:00 ` Andreas Schwab
2014-08-17 10:08 ` Steffen Prohaska
2014-08-17 11:03 ` Andreas Schwab
2014-08-17 7:27 ` Jeff King
2014-08-17 10:25 ` Steffen Prohaska
2014-08-17 11:33 ` Duy Nguyen
2014-08-19 7:53 ` Jeff King
2014-08-19 8:26 ` Steffen Prohaska
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1407303134-16635-2-git-send-email-prohaska@zib.de \
--to=prohaska@zib.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=schacon@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).