From: Junio C Hamano <gitster@pobox.com>
To: Eric Sunshine <sunshine@sunshineco.com>
Cc: Francesco Paparatto <francescopaparatto@gmail.com>, git@vger.kernel.org
Subject: Re: [PATCH v2] t3310: avoid hiding failures from rev-parse in command substitutions
Date: Thu, 05 Mar 2026 15:06:19 -0800 [thread overview]
Message-ID: <xmqqv7f927x0.fsf@gitster.g> (raw)
In-Reply-To: <CAPig+cTsYWVg0nrU7kMakOKQaqFSo=i_nZ=_YuCJK_hq5gdZPQ@mail.gmail.com> (Eric Sunshine's message of "Thu, 5 Mar 2026 17:34:21 -0500")
Eric Sunshine <sunshine@sunshineco.com> writes:
>> > diff --git a/t/t3310-notes-merge-manual-resolve.sh b/t/t3310-notes-merge-manual-resolve.sh
>> > index 92a5951331..64c0a753ff 100755
>>
>> On top of what commit is this patch designed to apply?
>
> What Junio probably means is that you appear to have based v2 atop v1,
> but instead you should squash v1 and v2 into a single patch, and send
> that as v3 so that when the patch is finally accepted into his tree,
> it will appear to have been perfect from the start (because v1 and v2
> will only exist in the mailing list archive, not in the Git project
> history).
No. The v1 and this one touch separate areas and can go
independently. The thing I had trouble with was that this did not
apply to either on top of v1 (which by the way is already in 'next')
nor on top of 'master'.
next prev parent reply other threads:[~2026-03-05 23:06 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-04 12:19 [PATCH] t3310: avoid hiding failures from rev-parse in command substitutions Francesco Paparatto
2026-03-04 22:21 ` Eric Sunshine
2026-03-05 9:06 ` [PATCH v2] " Francesco Paparatto
2026-03-05 19:13 ` Junio C Hamano
2026-03-05 22:34 ` Eric Sunshine
2026-03-05 22:49 ` Francesco Paparatto
2026-03-05 23:06 ` Junio C Hamano [this message]
2026-03-05 23:14 ` Junio C Hamano
2026-03-05 22:42 ` Francesco Paparatto
2026-03-05 22:51 ` [PATCH v3] " Francesco Paparatto
2026-03-07 6:29 ` Eric Sunshine
2026-03-07 10:17 ` Francesco Paparatto
2026-03-07 10:36 ` [PATCH v4] " Francesco Paparatto
2026-03-08 4:13 ` Eric Sunshine
2026-03-08 6:04 ` 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=xmqqv7f927x0.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=francescopaparatto@gmail.com \
--cc=git@vger.kernel.org \
--cc=sunshine@sunshineco.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