From: Junio C Hamano <gitster@pobox.com>
To: Phillip Wood <phillip.wood123@gmail.com>
Cc: "ZheNing Hu via GitGitGadget" <gitgitgadget@gmail.com>,
git@vger.kernel.org,
"Christian Couder" <christian.couder@gmail.com>,
"Hariom Verma" <hariom18599@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Han-Wen Nienhuys" <hanwen@google.com>,
"Ramkumar Ramachandra" <artagnon@gmail.com>,
"Felipe Contreras" <felipe.contreras@gmail.com>,
"ZheNing Hu" <adlternative@gmail.com>
Subject: Re: [PATCH v3] [GSOC] cherry-pick: use better advice message
Date: Fri, 13 Aug 2021 13:14:44 -0700 [thread overview]
Message-ID: <xmqqzgtlumob.fsf@gitster.g> (raw)
In-Reply-To: <a510722c-d5a2-f00c-dd20-dd7f76da2408@gmail.com> (Phillip Wood's message of "Wed, 11 Aug 2021 11:00:32 +0100")
Phillip Wood <phillip.wood123@gmail.com> writes:
>> +++ b/t/t3507-cherry-pick-conflict.sh
>> @@ -53,9 +53,12 @@ test_expect_success 'advice from failed cherry-pick' "
>> picked=\$(git rev-parse --short picked) &&
>> cat <<-EOF >expected &&
>
> If you quote the here doc end marker then there is no substitution in
> the here doc so writing
>
> cat <<-\EOF >expected &&
>
>> error: could not apply \$picked... picked
>> - hint: after resolving the conflicts, mark the corrected paths
>> - hint: with 'git add <paths>' or 'git rm <paths>'
>> - hint: and commit the result with 'git commit'
>> + hint: Resolve all conflicts manually, mark them as resolved with
>> + hint: \"git add/rm <conflicted_files>\", then run
>
> means you can replace \" with " here
Hmph, actually the double-quote that opens the body of
test_expect_success should be stared at with a very cautious eyes,
as they often do not mean what the author of the patch thought they
do. I can see that it already fooled your eyes into thinking that
there is no substitution, but $picked needs to be substituted into
its value. The backslash before it is *not* about guarding it from
substitution inside here-doc; it is to pass literal "$" into the
string, which is the last parameter to test_expect_success, that
gets eval'ed.
The original of this one, for example, would probably have been
better if written like so:
test_expect_success 'advice from failed cherry-pick' '
pristine_detach initial &&
SQ='\'' &&
picked=$(git rev-parse --short picked) &&
cat <<-EOF >expected &&
error: could not apply $picked... picked
hint: after resolving the conflicts, mark the corrected paths
hint: with ${SQ}git add <paths>${SQ} or ${SQ}git rm <paths>${SQ}
hint: and commit the result with ${SQ}git commit${SQ}
EOF
test_must_fail git cherry-pick picked 2>actual &&
test_cmp expected actual
'
And because there is no single quote in the updated text, it would
become:
test_expect_success 'advice from failed cherry-pick' '
pristine_detach initial &&
picked=$(git rev-parse --short picked) &&
cat <<-EOF >expected &&
error: could not apply $picked... picked
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run
EOF
test_must_fail git cherry-pick picked 2>actual &&
test_cmp expected actual
'
which makes it far easier to see that $picked needs to be
substituted, and the "git add/rm" are to be enclosed in dq pair.
next prev parent reply other threads:[~2021-08-13 20:14 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-31 7:01 [PATCH 0/2] [GSOC] cherry-pick: fix bug when used with GIT_CHERRY_PICK_HELP ZheNing Hu via GitGitGadget
2021-07-31 7:01 ` [PATCH 1/2] " ZheNing Hu via GitGitGadget
2021-08-01 10:09 ` Phillip Wood
2021-08-02 13:34 ` ZheNing Hu
2021-07-31 7:01 ` [PATCH 2/2] [GSOC] cherry-pick: use better advice message ZheNing Hu via GitGitGadget
2021-08-01 10:14 ` Phillip Wood
2021-08-02 13:35 ` ZheNing Hu
2021-08-03 1:16 ` [PATCH v2 0/2] [GSOC] cherry-pick: fix bug when used with GIT_CHERRY_PICK_HELP ZheNing Hu via GitGitGadget
2021-08-03 1:16 ` [PATCH v2 1/2] " ZheNing Hu via GitGitGadget
2021-08-03 22:36 ` Junio C Hamano
2021-08-04 8:35 ` ZheNing Hu
2021-08-04 10:10 ` Phillip Wood
2021-08-04 17:31 ` Junio C Hamano
2021-08-05 5:36 ` ZheNing Hu
2021-08-03 1:16 ` [PATCH v2 2/2] [GSOC] cherry-pick: use better advice message ZheNing Hu via GitGitGadget
2021-08-05 5:48 ` [PATCH v3] " ZheNing Hu via GitGitGadget
2021-08-11 10:00 ` Phillip Wood
2021-08-13 8:08 ` ZheNing Hu
2021-08-13 20:14 ` Junio C Hamano [this message]
2021-08-14 2:07 ` ZheNing Hu
2021-08-17 10:09 ` Phillip Wood
2021-08-14 10:27 ` [PATCH v4] " ZheNing Hu via GitGitGadget
2021-08-14 20:32 ` Junio C Hamano
2021-08-15 12:48 ` ZheNing Hu
2021-08-16 0:55 ` [PATCH v5] " ZheNing Hu via GitGitGadget
2021-08-18 9:51 ` Phillip Wood
2021-08-19 1:55 ` ZheNing Hu
2021-08-19 2:07 ` ZheNing Hu
2021-08-19 5:51 ` [PATCH v6] " ZheNing Hu via GitGitGadget
2021-08-19 17:10 ` Junio C Hamano
2021-08-21 1:40 ` ZheNing Hu
2021-08-22 13:08 ` [PATCH v7] " ZheNing Hu via GitGitGadget
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=xmqqzgtlumob.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=adlternative@gmail.com \
--cc=artagnon@gmail.com \
--cc=avarab@gmail.com \
--cc=christian.couder@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=hanwen@google.com \
--cc=hariom18599@gmail.com \
--cc=phillip.wood123@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;
as well as URLs for NNTP newsgroup(s).