diff: teach --stat to ignore uninteresting modifications #689

ROGERSM94 · 2020-08-01T22:09:34Z

This patch is based on the discussion these email threads:

https://lore.kernel.org/git/1484704915.2096.16.camel@mattmccutchen.net/
https://lore.kernel.org/git/CAOjrSZtQPQ8Xxuz+7SGykR8Q-gFDEZANSE5yQASqKjpbUAq_5Q@mail.gmail.com/

With the code mostly taken from this specific message:
https://lore.kernel.org/git/20170118111705.6bqzkklluikda3r5@sigill.intra.peff.net/

The summary is that when running git diff --stat in combination with --ignore-all-space or similar options, you'll see many lines of the form:

some-file.txt | 0

which can be misleading when you are explicitly telling git to "ignore all space" or something similar. To rectify this issue, this patch categorizes all files that are modified but have no effective changes as not fit to display to the user.

New in V2:

I've added a test covering the rename case with whitespace-changes and permissions changes
I've also updated the logic in builtin_diffstat to include that logic as well

CC: peff@peff.net

ROGERSM94 · 2020-08-01T23:18:42Z

/preview

gitgitgadget · 2020-08-01T23:19:32Z

Preview email sent as pull.689.git.1596323970075.gitgitgadget@gmail.com

ROGERSM94 · 2020-08-01T23:31:25Z

/preview

gitgitgadget · 2020-08-01T23:32:11Z

Preview email sent as pull.689.git.1596324728937.gitgitgadget@gmail.com

ROGERSM94 · 2020-08-01T23:32:35Z

/submit

gitgitgadget · 2020-08-01T23:33:33Z

Submitted as pull.689.git.1596324796918.gitgitgadget@gmail.com

gitgitgadget · 2020-08-02T00:32:56Z

On the Git mailing list, Junio C Hamano wrote (reply to this):

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

gitgitgadget · 2020-08-02T01:54:08Z

On the Git mailing list, Matt Rogers wrote (reply to this):

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

This first one is the behavior I was going for, I think it's most reasonable

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

I just ran some tests on my end, and you're correct here, I'll try to come
up with a reroll that addresses this and adds this as a test condition.

-- 
Matthew Rogers

ROGERSM94 · 2020-08-14T22:44:43Z

/submit

gitgitgadget · 2020-08-14T22:46:01Z

Submitted as pull.689.v2.git.1597445151824.gitgitgadget@gmail.com

gitgitgadget · 2020-08-17T21:43:01Z

On the Git mailing list, Junio C Hamano wrote (reply to this):

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

> From: Matthew Rogers <mattr94@gmail.com>
>
> Sometimes when diffing, files may show as being momdified even when

momdified? mummified? ah, modified.

> there are no interesting diffs to show.  This happens naturally when
> using options such as --ignore-space-change.  

Read the next paragraph and notice that it explains the cases where
the patch does not want not to show, and then read the above again
to realize that the above does not say anything about what it wants
to do to cases the next paragraph does not cover.  It only says such
a case often happens when --ignore-space-change is used.

	When options like --ignore-space-change is in use, files
	with modification can have no interesting textual changes
	worth showing.  In such cases, "git diff --stat" shows 0
	lines of additions and deletions.  Teach "git diff --stat"
	not to show such a path in its output, which would be more
	natural.

perhaps?

> We don't want to prevent
> the display  of all files that have 0 effective diffs since they could
> be the result of a rename, permission change, or other similar operation
> that may still be of interest so we special case additions and deletions
> as they are always interesting.

Yup.  That makes sense.  

It would be nice if this does not have to be implemented as a list
of exceptions, though.  Rather, a more targetted "omit output only
in this narrow case" would be nicer, but the check with the mode
bits should do at lesat for now.

> diff --git a/diff.c b/diff.c
> index f9709de7b4..131903fa3a 100644
> --- a/diff.c
> +++ b/diff.c
> @@ -3153,16 +3153,19 @@ static void show_dirstat_by_line(struct diffstat_t *data, struct diff_options *o
>  	gather_dirstat(options, &dir, changed, "", 0);
>  }
>  
> +static void free_diffstat_file(struct diffstat_file *f)
> +{
> +	free(f->print_name);
> +	free(f->name);
> +	free(f->from_name);
> +	free(f);
> +}
> +
>  void free_diffstat_info(struct diffstat_t *diffstat)
>  {
>  	int i;
> -	for (i = 0; i < diffstat->nr; i++) {
> -		struct diffstat_file *f = diffstat->files[i];
> -		free(f->print_name);
> -		free(f->name);
> -		free(f->from_name);
> -		free(f);
> -	}
> +	for (i = 0; i < diffstat->nr; i++)
> +		free_diffstat_file(diffstat->files[i]);
>  	free(diffstat->files);
>  }
>  
> @@ -3718,6 +3721,26 @@ static void builtin_diffstat(const char *name_a, const char *name_b,
>  		if (xdi_diff_outf(&mf1, &mf2, discard_hunk_line,
>  				  diffstat_consume, diffstat, &xpp, &xecfg))
>  			die("unable to generate diffstat for %s", one->path);
> +
> +		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,

			 * renames and mode changes without any content changes,

> +			 * as adding an empty file, for example is still of interest.
> +			 */
> +			if ((p->status == DIFF_STATUS_MODIFIED) 
> +				&& !file->added
> +				&& !file->deleted
> +				&& one->mode == two->mode) {
> +				free_diffstat_file(file);
> +				diffstat->nr--;
> +			}
> +		}
>  	}
>  
>  	diff_free_filespec_data(one);
> diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh
> index 88d3026894..8bdaa0a693 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,10 +799,44 @@ test_expect_success 'whitespace-only changes not reported' '
>  	test_must_be_empty actual
>  '
>  
> -test_expect_success 'whitespace-only changes reported across renames' '
> +test_expect_success 'whitespace-only changes not reported (diffstat)' '
> +	# reuse state from previous test
> +	git diff --stat -b >actual &&
> +	test_must_be_empty actual
> +'
> +
> +test_expect_success 'whitespace changes with modification reported (diffstat)' '
> +	git reset --hard &&
> +	echo >x "hello  world" &&
> +	git update-index --chmod=+x x &&
> +	git diff --stat --cached -b >actual &&
> +	cat <<-EOF >expect &&
> +	 x | 0
> +	 1 file changed, 0 insertions(+), 0 deletions(-)
> +	EOF
> +	test_cmp expect actual
> +'
> +
> +test_expect_success 'whitespace-only changes reported across renames (diffstat)' '
>  	git reset --hard &&
>  	for i in 1 2 3 4 5 6 7 8 9; do echo "$i$i$i$i$i$i"; done >x &&
>  	git add x &&
> +	git commit -m "base" &&
> +	sed -e "5s/^/ /" x >z &&
> +	git rm x &&
> +	git add z &&
> +	git diff -w -M --cached --stat >actual &&
> +	cat <<-EOF >expect &&
> +	 x => z | 0
> +	 1 file changed, 0 insertions(+), 0 deletions(-)
> +	EOF
> +	test_cmp expect actual
> +'
> +
> +test_expect_success 'whitespace-only changes reported across renames' '
> +	git reset --hard HEAD~1 &&
> +	for i in 1 2 3 4 5 6 7 8 9; do echo "$i$i$i$i$i$i"; done >x &&
> +	git add x &&
>  	hash_x=$(git hash-object x) &&
>  	before=$(git rev-parse --short "$hash_x") &&
>  	git commit -m "base" &&
>
> base-commit: 878e727637ec5815ccb3301eb994a54df95b21b8

gitgitgadget · 2020-08-17T22:10:21Z

This branch is now known as mr/diff-hide-stat-wo-textual-change.

gitgitgadget · 2020-08-17T22:10:22Z

This patch series was integrated into seen via git@9ad5e56.

gitgitgadget · 2020-08-17T22:40:09Z

On the Git mailing list, Matt Rogers wrote (reply to this):

On Mon, Aug 17, 2020 at 5:39 PM Junio C Hamano <gitster@pobox.com> wrote:
>
> "Matthew Rogers via GitGitGadget" <gitgitgadget@gmail.com> writes:
>
> > From: Matthew Rogers <mattr94@gmail.com>
> >
> > Sometimes when diffing, files may show as being momdified even when
>
> momdified? mummified? ah, modified.
>
> > there are no interesting diffs to show.  This happens naturally when
> > using options such as --ignore-space-change.
>
> Read the next paragraph and notice that it explains the cases where
> the patch does not want not to show, and then read the above again
> to realize that the above does not say anything about what it wants
> to do to cases the next paragraph does not cover.  It only says such
> a case often happens when --ignore-space-change is used.
>
>         When options like --ignore-space-change is in use, files
>         with modification can have no interesting textual changes
>         worth showing.  In such cases, "git diff --stat" shows 0
>         lines of additions and deletions.  Teach "git diff --stat"
>         not to show such a path in its output, which would be more
>         natural.
>
> perhaps?
>
> > We don't want to prevent
> > the display  of all files that have 0 effective diffs since they could
> > be the result of a rename, permission change, or other similar operation
> > that may still be of interest so we special case additions and deletions
> > as they are always interesting.
>
> Yup.  That makes sense.

I'll send a reroll with the message improved as you suggested, as well
as updating

>
> It would be nice if this does not have to be implemented as a list
> of exceptions, though.  Rather, a more targetted "omit output only
> in this narrow case" would be nicer, but the check with the mode
> bits should do at lesat for now.
>
> > diff --git a/diff.c b/diff.c
> > index f9709de7b4..131903fa3a 100644
> > --- a/diff.c
> > +++ b/diff.c
> > @@ -3153,16 +3153,19 @@ static void show_dirstat_by_line(struct diffstat_t *data, struct diff_options *o
> >       gather_dirstat(options, &dir, changed, "", 0);
> >  }
> >
> > +static void free_diffstat_file(struct diffstat_file *f)
> > +{
> > +     free(f->print_name);
> > +     free(f->name);
> > +     free(f->from_name);
> > +     free(f);
> > +}
> > +
> >  void free_diffstat_info(struct diffstat_t *diffstat)
> >  {
> >       int i;
> > -     for (i = 0; i < diffstat->nr; i++) {
> > -             struct diffstat_file *f = diffstat->files[i];
> > -             free(f->print_name);
> > -             free(f->name);
> > -             free(f->from_name);
> > -             free(f);
> > -     }
> > +     for (i = 0; i < diffstat->nr; i++)
> > +             free_diffstat_file(diffstat->files[i]);
> >       free(diffstat->files);
> >  }
> >
> > @@ -3718,6 +3721,26 @@ static void builtin_diffstat(const char *name_a, const char *name_b,
> >               if (xdi_diff_outf(&mf1, &mf2, discard_hunk_line,
> >                                 diffstat_consume, diffstat, &xpp, &xecfg))
> >                       die("unable to generate diffstat for %s", one->path);
> > +
> > +             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,
>
>                          * renames and mode changes without any content changes,
>
> > +                      * as adding an empty file, for example is still of interest.
> > +                      */
> > +                     if ((p->status == DIFF_STATUS_MODIFIED)
> > +                             && !file->added
> > +                             && !file->deleted
> > +                             && one->mode == two->mode) {
> > +                             free_diffstat_file(file);
> > +                             diffstat->nr--;
> > +                     }
> > +             }
> >       }
> >
> >       diff_free_filespec_data(one);
> > diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh
> > index 88d3026894..8bdaa0a693 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,10 +799,44 @@ test_expect_success 'whitespace-only changes not reported' '
> >       test_must_be_empty actual
> >  '
> >
> > -test_expect_success 'whitespace-only changes reported across renames' '
> > +test_expect_success 'whitespace-only changes not reported (diffstat)' '
> > +     # reuse state from previous test
> > +     git diff --stat -b >actual &&
> > +     test_must_be_empty actual
> > +'
> > +
> > +test_expect_success 'whitespace changes with modification reported (diffstat)' '
> > +     git reset --hard &&
> > +     echo >x "hello  world" &&
> > +     git update-index --chmod=+x x &&
> > +     git diff --stat --cached -b >actual &&
> > +     cat <<-EOF >expect &&
> > +      x | 0
> > +      1 file changed, 0 insertions(+), 0 deletions(-)
> > +     EOF
> > +     test_cmp expect actual
> > +'
> > +
> > +test_expect_success 'whitespace-only changes reported across renames (diffstat)' '
> >       git reset --hard &&
> >       for i in 1 2 3 4 5 6 7 8 9; do echo "$i$i$i$i$i$i"; done >x &&
> >       git add x &&
> > +     git commit -m "base" &&
> > +     sed -e "5s/^/ /" x >z &&
> > +     git rm x &&
> > +     git add z &&
> > +     git diff -w -M --cached --stat >actual &&
> > +     cat <<-EOF >expect &&
> > +      x => z | 0
> > +      1 file changed, 0 insertions(+), 0 deletions(-)
> > +     EOF
> > +     test_cmp expect actual
> > +'
> > +
> > +test_expect_success 'whitespace-only changes reported across renames' '
> > +     git reset --hard HEAD~1 &&
> > +     for i in 1 2 3 4 5 6 7 8 9; do echo "$i$i$i$i$i$i"; done >x &&
> > +     git add x &&
> >       hash_x=$(git hash-object x) &&
> >       before=$(git rev-parse --short "$hash_x") &&
> >       git commit -m "base" &&
> >
> > base-commit: 878e727637ec5815ccb3301eb994a54df95b21b8



-- 
Matthew Rogers

gitgitgadget · 2020-08-17T22:40:10Z

On the Git mailing list, Matt Rogers wrote (reply to this):

...As well as updating the comment.

(sorry for the double mail I fat fingered ctrl+enter while typing)

On Mon, Aug 17, 2020 at 6:37 PM Matt Rogers <mattr94@gmail.com> wrote:
>
> On Mon, Aug 17, 2020 at 5:39 PM Junio C Hamano <gitster@pobox.com> wrote:
> >
> > "Matthew Rogers via GitGitGadget" <gitgitgadget@gmail.com> writes:
> >
> > > From: Matthew Rogers <mattr94@gmail.com>
> > >
> > > Sometimes when diffing, files may show as being momdified even when
> >
> > momdified? mummified? ah, modified.
> >
> > > there are no interesting diffs to show.  This happens naturally when
> > > using options such as --ignore-space-change.
> >
> > Read the next paragraph and notice that it explains the cases where
> > the patch does not want not to show, and then read the above again
> > to realize that the above does not say anything about what it wants
> > to do to cases the next paragraph does not cover.  It only says such
> > a case often happens when --ignore-space-change is used.
> >
> >         When options like --ignore-space-change is in use, files
> >         with modification can have no interesting textual changes
> >         worth showing.  In such cases, "git diff --stat" shows 0
> >         lines of additions and deletions.  Teach "git diff --stat"
> >         not to show such a path in its output, which would be more
> >         natural.
> >
> > perhaps?
> >
> > > We don't want to prevent
> > > the display  of all files that have 0 effective diffs since they could
> > > be the result of a rename, permission change, or other similar operation
> > > that may still be of interest so we special case additions and deletions
> > > as they are always interesting.
> >
> > Yup.  That makes sense.
>
> I'll send a reroll with the message improved as you suggested, as well
> as updating
>
> >
> > It would be nice if this does not have to be implemented as a list
> > of exceptions, though.  Rather, a more targetted "omit output only
> > in this narrow case" would be nicer, but the check with the mode
> > bits should do at lesat for now.
> >
> > > diff --git a/diff.c b/diff.c
> > > index f9709de7b4..131903fa3a 100644
> > > --- a/diff.c
> > > +++ b/diff.c
> > > @@ -3153,16 +3153,19 @@ static void show_dirstat_by_line(struct diffstat_t *data, struct diff_options *o
> > >       gather_dirstat(options, &dir, changed, "", 0);
> > >  }
> > >
> > > +static void free_diffstat_file(struct diffstat_file *f)
> > > +{
> > > +     free(f->print_name);
> > > +     free(f->name);
> > > +     free(f->from_name);
> > > +     free(f);
> > > +}
> > > +
> > >  void free_diffstat_info(struct diffstat_t *diffstat)
> > >  {
> > >       int i;
> > > -     for (i = 0; i < diffstat->nr; i++) {
> > > -             struct diffstat_file *f = diffstat->files[i];
> > > -             free(f->print_name);
> > > -             free(f->name);
> > > -             free(f->from_name);
> > > -             free(f);
> > > -     }
> > > +     for (i = 0; i < diffstat->nr; i++)
> > > +             free_diffstat_file(diffstat->files[i]);
> > >       free(diffstat->files);
> > >  }
> > >
> > > @@ -3718,6 +3721,26 @@ static void builtin_diffstat(const char *name_a, const char *name_b,
> > >               if (xdi_diff_outf(&mf1, &mf2, discard_hunk_line,
> > >                                 diffstat_consume, diffstat, &xpp, &xecfg))
> > >                       die("unable to generate diffstat for %s", one->path);
> > > +
> > > +             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,
> >
> >                          * renames and mode changes without any content changes,
> >
> > > +                      * as adding an empty file, for example is still of interest.
> > > +                      */
> > > +                     if ((p->status == DIFF_STATUS_MODIFIED)
> > > +                             && !file->added
> > > +                             && !file->deleted
> > > +                             && one->mode == two->mode) {
> > > +                             free_diffstat_file(file);
> > > +                             diffstat->nr--;
> > > +                     }
> > > +             }
> > >       }
> > >
> > >       diff_free_filespec_data(one);
> > > diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh
> > > index 88d3026894..8bdaa0a693 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,10 +799,44 @@ test_expect_success 'whitespace-only changes not reported' '
> > >       test_must_be_empty actual
> > >  '
> > >
> > > -test_expect_success 'whitespace-only changes reported across renames' '
> > > +test_expect_success 'whitespace-only changes not reported (diffstat)' '
> > > +     # reuse state from previous test
> > > +     git diff --stat -b >actual &&
> > > +     test_must_be_empty actual
> > > +'
> > > +
> > > +test_expect_success 'whitespace changes with modification reported (diffstat)' '
> > > +     git reset --hard &&
> > > +     echo >x "hello  world" &&
> > > +     git update-index --chmod=+x x &&
> > > +     git diff --stat --cached -b >actual &&
> > > +     cat <<-EOF >expect &&
> > > +      x | 0
> > > +      1 file changed, 0 insertions(+), 0 deletions(-)
> > > +     EOF
> > > +     test_cmp expect actual
> > > +'
> > > +
> > > +test_expect_success 'whitespace-only changes reported across renames (diffstat)' '
> > >       git reset --hard &&
> > >       for i in 1 2 3 4 5 6 7 8 9; do echo "$i$i$i$i$i$i"; done >x &&
> > >       git add x &&
> > > +     git commit -m "base" &&
> > > +     sed -e "5s/^/ /" x >z &&
> > > +     git rm x &&
> > > +     git add z &&
> > > +     git diff -w -M --cached --stat >actual &&
> > > +     cat <<-EOF >expect &&
> > > +      x => z | 0
> > > +      1 file changed, 0 insertions(+), 0 deletions(-)
> > > +     EOF
> > > +     test_cmp expect actual
> > > +'
> > > +
> > > +test_expect_success 'whitespace-only changes reported across renames' '
> > > +     git reset --hard HEAD~1 &&
> > > +     for i in 1 2 3 4 5 6 7 8 9; do echo "$i$i$i$i$i$i"; done >x &&
> > > +     git add x &&
> > >       hash_x=$(git hash-object x) &&
> > >       before=$(git rev-parse --short "$hash_x") &&
> > >       git commit -m "base" &&
> > >
> > > base-commit: 878e727637ec5815ccb3301eb994a54df95b21b8
>
>
>
> --
> Matthew Rogers



-- 
Matthew Rogers

gitgitgadget · 2020-08-18T00:45:40Z

This patch series was integrated into seen via git@6629d1c.

gitgitgadget · 2020-08-18T22:41:47Z

This patch series was integrated into seen via git@719a4df.

gitgitgadget · 2020-08-18T23:24:20Z

This patch series was integrated into seen via git@009659f.

gitgitgadget · 2020-08-19T22:08:29Z

This patch series was integrated into seen via git@a5222e6.

When options such as --ignore-space-change are in use, files with modifications can have no interesting textual changes worth showing. In such cases, "git diff --stat" shows 0 lines of additions and deletions. Teach "git diff --stat" not to show such a path in its output, which would be more natural. However, we don't want to prevent the display of all files that have 0 effective diffs since they could be the result of a rename, permission change, or other similar operation that may still be of interest so we special case additions and deletions as they are always interesting. Signed-off-by: Matthew Rogers <mattr94@gmail.com>

gitgitgadget · 2020-08-20T00:26:42Z

This patch series was integrated into seen via git@bc8b4d7.

ROGERSM94 · 2020-08-20T00:39:35Z

/submit

gitgitgadget · 2020-08-20T00:41:44Z

Submitted as pull.689.v3.git.1597884092580.gitgitgadget@gmail.com

To fetch this version into FETCH_HEAD:

git fetch https://github.com/gitgitgadget/git pr-689/ROGERSM94/zero-diffs-v3

To fetch this version to local tag pr-689/ROGERSM94/zero-diffs-v3:

git fetch --no-tags https://github.com/gitgitgadget/git tag pr-689/ROGERSM94/zero-diffs-v3

gitgitgadget · 2020-08-20T00:58:28Z

On the Git mailing list, Junio C Hamano wrote (reply to this):

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

> From: Matthew Rogers <mattr94@gmail.com>
>
> When options such as --ignore-space-change are in use, files with
> modifications can have no interesting textual changes worth showing.  In
> such cases, "git diff --stat" shows 0 lines of additions and deletions.
> Teach "git diff --stat" not to show such a path in its output, which
> would be more natural.
>
> However, we don't want to prevent the display  of all files that have 0
> effective diffs since they could be the result of a rename, permission
> change, or other similar operation that may still be of interest so we
> special case additions and deletions as they are always interesting.
>
> Signed-off-by: Matthew Rogers <mattr94@gmail.com>
> ---

Looks good, thanks.  Will queue.


By the way, before making your commits, please make sure you do not
have whitespace errors.  I've let my "git am" to fix them, so no
need to resend, but for future reference...

.git/rebase-apply/patch:116: trailing whitespace.
			struct diffstat_file *file = 
.git/rebase-apply/patch:119: trailing whitespace.
			 * Omit diffstats of modified files where nothing changed. 
.git/rebase-apply/patch:122: trailing whitespace.
			 * 
.git/rebase-apply/patch:124: trailing whitespace.
			 * renames, and mode changes as adding an empty file, 
.git/rebase-apply/patch:127: trailing whitespace.
			if ((p->status == DIFF_STATUS_MODIFIED) 
warning: 5 lines applied after fixing whitespace errors.
Applying: diff: teach --stat to ignore uninteresting modifications

gitgitgadget · 2020-08-20T01:05:56Z

This patch series was integrated into seen via git@88f1d9a.

gitgitgadget · 2020-08-20T21:36:40Z

This patch series was integrated into seen via git@ad21b93.

gitgitgadget · 2020-08-21T21:29:24Z

This patch series was integrated into seen via git@bfcd43b.

gitgitgadget · 2020-08-22T01:34:06Z

This patch series was integrated into seen via git@f1d7e2a.

gitgitgadget · 2020-08-22T21:02:19Z

This patch series was integrated into seen via git@3eb1aed.

gitgitgadget · 2020-08-22T23:41:45Z

This patch series was integrated into seen via git@029b82f.

gitgitgadget · 2020-08-24T23:08:52Z

This patch series was integrated into seen via git@83ad61a.

gitgitgadget · 2020-08-25T01:03:13Z

This patch series was integrated into seen via git@f112707.

gitgitgadget · 2020-08-25T23:05:23Z

This patch series was integrated into seen via git@f9d8048.

gitgitgadget · 2020-08-26T22:08:09Z

This patch series was integrated into seen via git@d407f08.

gitgitgadget · 2020-08-27T20:43:35Z

This patch series was integrated into seen via git@c493a24.

gitgitgadget · 2020-08-27T21:49:06Z

This patch series was integrated into seen via git@a04ada6.

gitgitgadget · 2020-08-27T21:49:07Z

This patch series was integrated into next via git@b9e9725.

gitgitgadget · 2020-08-29T07:24:31Z

This patch series was integrated into seen via git@e795371.

gitgitgadget · 2020-08-31T23:57:01Z

This patch series was integrated into seen via git@302a020.

gitgitgadget · 2020-09-02T22:39:15Z

This patch series was integrated into seen via git@723602c.

gitgitgadget · 2020-09-03T20:40:04Z

This patch series was integrated into seen via git@b58e47a.

gitgitgadget · 2020-09-03T20:40:05Z

This patch series was integrated into next via git@b58e47a.

gitgitgadget · 2020-09-03T20:40:06Z

This patch series was integrated into master via git@b58e47a.

gitgitgadget · 2020-09-03T20:40:09Z

Closed via b58e47a.

weekly-digest bot mentioned this pull request Aug 2, 2020

Weekly Digest (26 July, 2020 - 2 August, 2020) #690

Closed

weekly-digest bot mentioned this pull request Aug 9, 2020

Weekly Digest (2 August, 2020 - 9 August, 2020) #697

Closed

ROGERSM94 force-pushed the zero-diffs branch 4 times, most recently from 65153a5 to 6c5db18 Compare August 14, 2020 21:31

gitgitgadget bot added the seen label Aug 17, 2020

ROGERSM94 force-pushed the zero-diffs branch from 6c5db18 to 7c31138 Compare August 19, 2020 22:56

gitgitgadget bot added the next label Aug 27, 2020

gitgitgadget bot added the master label Sep 3, 2020

gitgitgadget bot closed this Sep 3, 2020

diff: teach --stat to ignore uninteresting modifications #689

diff: teach --stat to ignore uninteresting modifications #689

Uh oh!

Conversation

ROGERSM94 commented Aug 1, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ROGERSM94 commented Aug 1, 2020

Uh oh!

gitgitgadget bot commented Aug 1, 2020

Uh oh!

ROGERSM94 commented Aug 1, 2020

Uh oh!

gitgitgadget bot commented Aug 1, 2020

Uh oh!

ROGERSM94 commented Aug 1, 2020

Uh oh!

gitgitgadget bot commented Aug 1, 2020

Uh oh!

gitgitgadget bot commented Aug 2, 2020

Uh oh!

gitgitgadget bot commented Aug 2, 2020

Uh oh!

ROGERSM94 commented Aug 14, 2020

Uh oh!

gitgitgadget bot commented Aug 14, 2020

Uh oh!

gitgitgadget bot commented Aug 17, 2020

Uh oh!

gitgitgadget bot commented Aug 17, 2020

Uh oh!

gitgitgadget bot commented Aug 17, 2020

Uh oh!

gitgitgadget bot commented Aug 17, 2020

Uh oh!

gitgitgadget bot commented Aug 17, 2020

Uh oh!

gitgitgadget bot commented Aug 18, 2020

Uh oh!

gitgitgadget bot commented Aug 18, 2020

Uh oh!

gitgitgadget bot commented Aug 18, 2020

Uh oh!

gitgitgadget bot commented Aug 19, 2020

Uh oh!

gitgitgadget bot commented Aug 20, 2020

Uh oh!

ROGERSM94 commented Aug 20, 2020

Uh oh!

gitgitgadget bot commented Aug 20, 2020

Uh oh!

gitgitgadget bot commented Aug 20, 2020

Uh oh!

gitgitgadget bot commented Aug 20, 2020

Uh oh!

gitgitgadget bot commented Aug 20, 2020

Uh oh!

gitgitgadget bot commented Aug 21, 2020

Uh oh!

gitgitgadget bot commented Aug 22, 2020

Uh oh!

gitgitgadget bot commented Aug 22, 2020

Uh oh!

gitgitgadget bot commented Aug 22, 2020

Uh oh!

gitgitgadget bot commented Aug 24, 2020

Uh oh!

gitgitgadget bot commented Aug 25, 2020

Uh oh!

gitgitgadget bot commented Aug 25, 2020

Uh oh!

gitgitgadget bot commented Aug 26, 2020

Uh oh!

gitgitgadget bot commented Aug 27, 2020

Uh oh!

gitgitgadget bot commented Aug 27, 2020

Uh oh!

gitgitgadget bot commented Aug 27, 2020

Uh oh!

gitgitgadget bot commented Aug 29, 2020

ROGERSM94 commented Aug 1, 2020 •

edited

Loading