Re: [PATCH v5 1/4] convert: Refactor would_convert_to_git() to single arg 'path'
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Aug 25, 2014, 22:55 UTC
- Message-ID
- <xmqqvbpgji13.fsf@gitster.dls.corp.google.com>
- In-Reply-To
- <1408896466-23149-2-git-send-email-prohaska@zib.de>
Steffen Prohaska <prohaska@zib.de> writes:
Show 6 quoted lines
> 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> > ---
I've retitled this as:
convert: drop arguments other than 'path' from would_convert_to_git()
to match the output from "git shortlog --since=3.months --no-merges" by using lowercase 'd' after the "convert: " area name, and also more importantly avoid calling "refactor" which this change is not.
Thanks.
Show 34 quoted lines
> 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);