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

From: Junio C Hamano <gitster@pobox•com>
To: Dennis Kaarsemaker <dennis@kaarsemaker•net>
Cc: git@vger•kernel.org
Subject: Re: [PATCH v3 1/2] diff --no-index: optionally follow symlinks
Date: Sun, 19 Mar 2017 15:14:53 -0700	[thread overview]
Message-ID: <xmqqk27kzzfm.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170318210038.22638-2-dennis@kaarsemaker.net> (Dennis Kaarsemaker's message of "Sat, 18 Mar 2017 22:00:37 +0100")

Dennis Kaarsemaker <dennis@kaarsemaker•net> writes:

> diff --git a/diff.c b/diff.c
> index be11e4ef2b..2afecfb939 100644
> --- a/diff.c
> +++ b/diff.c
> @@ -2815,7 +2815,7 @@ int diff_populate_filespec(struct diff_filespec *s, unsigned int flags)
>  		s->size = xsize_t(st.st_size);
>  		if (!s->size)
>  			goto empty;
> -		if (S_ISLNK(st.st_mode)) {
> +		if (S_ISLNK(s->mode)) {
>  			struct strbuf sb = STRBUF_INIT;
>  
>  			if (strbuf_readlink(&sb, s->path, s->size))
> @@ -2825,6 +2825,10 @@ int diff_populate_filespec(struct diff_filespec *s, unsigned int flags)
>  			s->should_free = 1;
>  			return 0;
>  		}
> +		if (S_ISLNK(st.st_mode)) {
> +			stat(s->path, &st);
> +			s->size = xsize_t(st.st_size);

Doesn't this affect --no-index mode?  We never need to do a wasteful
stat() after lstat() and we are penalizing the normal codepath with
this change, no?

> @@ -3884,7 +3888,11 @@ int diff_opt_parse(struct diff_options *options,
>  	else if (!strcmp(arg, "--no-follow")) {
>  		DIFF_OPT_CLR(options, FOLLOW_RENAMES);
>  		DIFF_OPT_CLR(options, DEFAULT_FOLLOW_RENAMES);
> -	} else if (!strcmp(arg, "--color"))
> +	} else if (!strcmp(arg, "--dereference"))
> +		DIFF_OPT_SET(options, DEREFERENCE);
> +	else if (!strcmp(arg, "--no-dereference"))
> +		DIFF_OPT_CLR(options, DEREFERENCE);
> +	else if (!strcmp(arg, "--color"))
>  		options->use_color = 1;

Also shouldn't be some code to detect --[no-]dereference options
given when --no-index is not in effect and error out?  As the patch
title says, this change should be a no-op for normal codepath and
only affect the no-index hack.

next prev parent reply	other threads:[~2017-03-19 22:15 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-18 21:00 [PATCH v3 0/2] diff --no-index: support symlinks and pipes Dennis Kaarsemaker
2017-03-18 21:00 ` [PATCH v3 1/2] diff --no-index: optionally follow symlinks Dennis Kaarsemaker
2017-03-19 22:14   ` Junio C Hamano [this message]
2017-03-20 10:50     ` Dennis Kaarsemaker
2017-03-18 21:00 ` [PATCH v3 2/2] diff --no-index: support reading from pipes Dennis Kaarsemaker
2017-03-19 22:08 ` [PATCH v3 0/2] diff --no-index: support symlinks and pipes Junio C Hamano
2017-03-20 10:40   ` Dennis Kaarsemaker
2017-03-20 16:02     ` Junio C Hamano

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=xmqqk27kzzfm.fsf@gitster.mtv.corp.google.com \
    --to=gitster@pobox$(echo .)com \
    --cc=dennis@kaarsemaker$(echo .)net \
    --cc=git@vger$(echo .)kernel.org \
    /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