Git development
 help / color / mirror / Atom feed
From: Phillip Wood <phillip.wood123@gmail.com>
To: "SZEDER Gábor" <szeder.dev@gmail.com>, git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
	Michael Montalbo <mmontalbo@gmail.com>,
	Denton Liu <liu.denton@gmail.com>
Subject: Re: [PATCH] t3420-rebase-autostash: don't try to grep non-existing files
Date: Sat, 27 Jun 2026 10:03:13 +0100	[thread overview]
Message-ID: <790bfda2-30f0-4629-9416-8324b29f68d2@gmail.com> (raw)
In-Reply-To: <aj90x3DsER5HASUS@szeder.dev>

On 27/06/2026 07:59, SZEDER Gábor wrote:
> On Sun, Oct 10, 2021 at 07:28:09PM +0200, SZEDER Gábor wrote:
>> diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh
>> index 43fcb68f27..bbe82d2c0c 100755
>> --- a/t/t3420-rebase-autostash.sh
>> +++ b/t/t3420-rebase-autostash.sh
>> @@ -200,7 +200,7 @@ testrebase () {

With an extra context line we see

		test_path_is_missing file3 &&>>   		git rebase --quit &&
>>   		test_when_finished git stash drop &&
>>   		test_path_is_missing $dotest/autostash &&
>> -		! grep dirty file3 &&
>> +		test_path_is_missing file3 &&

and so it is quite clear that this change is correct

Thanks

Phillip

>>   		git stash show -p >actual &&
>>   		test_cmp expect actual &&
>>   		git reset --hard &&
>> -- 
>> 2.33.0.1279.g1a260bf8c2
> 
> It appears that this patch might have fallen quite deep through the
> cracks... ;)
> 
> But the issue this patch is addressing is still there, and the patch
> still applies cleanly after almost 5 years.
> 


  reply	other threads:[~2026-06-27  9:03 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-10 17:28 [PATCH] t3420-rebase-autostash: don't try to grep non-existing files SZEDER Gábor
2026-06-27  6:59 ` SZEDER Gábor
2026-06-27  9:03   ` Phillip Wood [this message]
2026-06-27 14:27   ` Todd Zullinger

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=790bfda2-30f0-4629-9416-8324b29f68d2@gmail.com \
    --to=phillip.wood123@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=liu.denton@gmail.com \
    --cc=mmontalbo@gmail.com \
    --cc=phillip.wood@dunelm.org.uk \
    --cc=szeder.dev@gmail.com \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox