public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Junio C Hamano <gitster@pobox•com>
To: Steffen Prohaska <prohaska@zib•de>
Cc: git@vger•kernel.org, peff@peff•net, pclouds@gmail•com,
	john@keeping•me.uk, schacon@gmail•com
Subject: Re: [PATCH v5 1/4] convert: Refactor would_convert_to_git() to single arg 'path'
Date: Mon, 25 Aug 2014 15:55:52 -0700	[thread overview]
Message-ID: <xmqqvbpgji13.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1408896466-23149-2-git-send-email-prohaska@zib.de> (Steffen Prohaska's message of "Sun, 24 Aug 2014 18:07:43 +0200")

Steffen Prohaska <prohaska@zib•de> writes:

> 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.

>  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);

next prev parent reply	other threads:[~2014-08-25 22:56 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-24 16:07 [PATCH v5 0/4] Stream fd to clean filter; GIT_MMAP_LIMIT, GIT_ALLOC_LIMIT with git_parse_ulong() Steffen Prohaska
2014-08-24 16:07 ` [PATCH v5 1/4] convert: Refactor would_convert_to_git() to single arg 'path' Steffen Prohaska
2014-08-25 22:55   ` Junio C Hamano [this message]
2014-08-24 16:07 ` [PATCH v5 2/4] Change GIT_ALLOC_LIMIT check to use git_parse_ulong() Steffen Prohaska
2014-08-25 11:38   ` Jeff King
2014-08-25 15:06     ` Steffen Prohaska
2014-08-25 15:12       ` Jeff King
2014-08-24 16:07 ` [PATCH v5 3/4] Introduce GIT_MMAP_LIMIT to allow testing expected mmap size Steffen Prohaska
2014-08-24 16:07 ` [PATCH v5 4/4] convert: Stream from fd to required clean filter instead of mmap Steffen Prohaska
2014-08-25 12:43   ` Jeff King
2014-08-25 16:55     ` Steffen Prohaska
2014-08-25 18:35       ` Junio C Hamano
2014-08-26 18:00         ` Jeff King
2014-08-26 19:32           ` Junio C Hamano
2014-08-26 17:54       ` Jeff King

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=xmqqvbpgji13.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=john@keeping$(echo .)me.uk \
    --cc=pclouds@gmail$(echo .)com \
    --cc=peff@peff$(echo .)net \
    --cc=prohaska@zib$(echo .)de \
    --cc=schacon@gmail$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox