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

From: Lidong Yan <yldhome2d2@gmail•com>
To: Junio C Hamano <gitster@pobox•com>
Cc: gitgitgadget@gmail•com, git@vger•kernel.org,
	Johannes.Schindelin@gmx•de, jake@zimmerman•io, peff@peff•net
Subject: Re: [PATCH v4] diff: stop output garbled message in dry run mode
Date: Thu, 23 Oct 2025 08:27:49 +0800	[thread overview]
Message-ID: <4CB69AD9-2A1B-46FE-88DA-B98CF81C528A@gmail.com> (raw)
In-Reply-To: <xmqqwm4mwrix.fsf@gitster.g>

Junio C Hamano <gitster@pobox•com> writes:
> 
> t/t4013-diff-various.sh | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
> index d35695f5b0..c0a558da55 100755
> --- a/t/t4013-diff-various.sh
> +++ b/t/t4013-diff-various.sh
> @@ -683,11 +683,7 @@ test_expect_success 'diff -I<regex>: ignore all content changes' '
> 
> test_diff_no_content_changes () {
> git diff $1 --ignore-blank-lines -I".*" >actual &&
> - test_line_count = 3 actual &&
> - test_grep "file1" actual &&
> - test_grep "file2" actual &&
> - test_grep "file3" actual &&
> - test_grep ! "diff --git" actual
> + test_must_be_empty actual
> } &&
> test_diff_no_content_changes "--raw" &&
> test_diff_no_content_changes "--name-only" &&
> -- 
> 2.51.1-638-ge1c807bd82
> 

file1 is removed, file2 changes its mode from a regular file
to a directory and file3 is unmerged -- but the output is empty?
I am just a little confused why the ‘actual’ file should be empty.

Thanks,
Lidong 

next prev parent reply	other threads:[~2025-10-23  0:28 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-10-17  3:17 [PATCH] diff: stop output garbled message in dry run mode Lidong Yan via GitGitGadget
2025-10-17 12:07 ` Johannes Schindelin
2025-10-17 19:15   ` Junio C Hamano
2025-10-17 20:19     ` Junio C Hamano
2025-10-17 20:17   ` Junio C Hamano
2025-10-17 16:17 ` Junio C Hamano
2025-10-18  1:11   ` Lidong Yan
2025-10-18  5:02     ` Junio C Hamano
2025-10-18  9:47     ` Jeff King
2025-10-18  9:50       ` Lidong Yan
2025-10-18  9:56         ` Jeff King
2025-10-18 15:44       ` Junio C Hamano
2025-10-19 14:31         ` Lidong Yan
2025-10-19 15:33           ` Junio C Hamano
2025-10-18  9:48 ` [PATCH v2] " Lidong Yan
2025-10-19 16:20   ` [PATCH v3] " Lidong Yan
2025-10-19 16:30   ` [PATCH v4] " Lidong Yan
2025-10-22 19:53     ` Junio C Hamano
2025-10-22 21:33       ` Junio C Hamano
2025-10-23  0:27         ` Lidong Yan [this message]
2025-10-23 12:30     ` 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=4CB69AD9-2A1B-46FE-88DA-B98CF81C528A@gmail.com \
    --to=yldhome2d2@gmail$(echo .)com \
    --cc=Johannes.Schindelin@gmx$(echo .)de \
    --cc=git@vger$(echo .)kernel.org \
    --cc=gitgitgadget@gmail$(echo .)com \
    --cc=gitster@pobox$(echo .)com \
    --cc=jake@zimmerman$(echo .)io \
    --cc=peff@peff$(echo .)net \
    /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