git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "Matthew Rogers via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, peff@peff.net, Matthew Rogers <mattr94@gmail.com>
Subject: Re: [PATCH] diff: teach --stat to ignore uninteresting modifications
Date: Sat, 01 Aug 2020 17:31:25 -0700	[thread overview]
Message-ID: <xmqqv9i128iq.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <pull.689.git.1596324796918.gitgitgadget@gmail.com> (Matthew Rogers via GitGitGadget's message of "Sat, 01 Aug 2020 23:33:16 +0000")

"Matthew Rogers via GitGitGadget" <gitgitgadget@gmail.com> writes:

> +		if (DIFF_FILE_VALID(one) && DIFF_FILE_VALID(two)) {
> +			struct diffstat_file *file = 
> +				diffstat->files[diffstat->nr - 1];
> +			/*
> +			 * Omit diffstats of modified files where nothing changed. 
> +			 * Even if !same_contents, this might be the case due to
> +			 * ignoring whitespace changes, etc.
> +			 * 
> +			 * But note that we special-case additions and deletions,
> +			 * as adding an empty file, for example is still of interest.
> +			 */
> +			if (p->status == DIFF_STATUS_MODIFIED 
> +				&& !file->added
> +				&& !file->deleted) {
> +				free_diffstat_file(file);
> +				diffstat->nr--;
> +			}
> +		}
>  	}
> 
>  	diff_free_filespec_data(one);

There are some "trailing whitespace" errors detected by "git am/apply".

> diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh
> index 88d3026894..32c1b967f9 100755
> --- a/t/t4015-diff-whitespace.sh
> +++ b/t/t4015-diff-whitespace.sh
> @@ -789,7 +789,7 @@ test_expect_success 'checkdiff allows new blank lines' '
>  	git diff --check
>  '
>  
> -test_expect_success 'whitespace-only changes not reported' '
> +test_expect_success 'whitespace-only changes not reported (diff)' '
>  	git reset --hard &&
>  	echo >x "hello world" &&
>  	git add x &&
> @@ -799,6 +799,12 @@ test_expect_success 'whitespace-only changes not reported' '
>  	test_must_be_empty actual
>  '
>  
> +test_expect_success 'whitespace-only changes not reported (diffstat)' '
> +	# reuse state from previous test
> +	git diff --stat -b >actual &&
> +	test_must_be_empty actual
> +'
> +

This is a "let's show off our shiny new toy" test, which shows that
the code change covered the case you are interested in changing.
We'd also need tests that makes sure that the effect of the code
change is not seen when it should not trigger.

For example, if we further change mode bits of file 'x' (which has a
whitespace-only changes applied in the test in the previous hunk),
e.g.

	git update-index --chmod=+x x &&
	git diff --stat -b --cached >actual

should that be counted as a file with 0-line change that is worth
reporting, or is it hidden?  I _think_ the new code will do a wrong
thing here.  That is,

 - If the change truly is only mode bits and one and two have
   "same_contents", the new code is bypassed, and we'll continue to
   show "0 lines changed, but the file is worth reporting".

 - If the change is whitespace-only change plus mode bits, i.e. one
   and two do not have "same_contents", the new code triggers and
   the stat output is suppressed for the path.




  reply	other threads:[~2020-08-02  0:33 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-01 23:33 Matthew Rogers via GitGitGadget
2020-08-02  0:31 ` Junio C Hamano [this message]
2020-08-02  1:51   ` Matt Rogers
2020-08-14 22:45 ` [PATCH v2] " Matthew Rogers via GitGitGadget
2020-08-17 21:39   ` Junio C Hamano
2020-08-17 22:37     ` Matt Rogers
2020-08-17 22:37       ` Matt Rogers
2020-08-20  0:41   ` [PATCH v3] " Matthew Rogers via GitGitGadget
2020-08-20  0:56     ` 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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqv9i128iq.fsf@gitster.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=mattr94@gmail.com \
    --cc=peff@peff.net \
    --subject='Re: [PATCH] diff: teach --stat to ignore uninteresting modifications' \
    /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

Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).