From: Junio C Hamano <gitster@pobox.com>
To: "René Scharfe" <l.s.r@web.de>
Cc: Git List <git@vger.kernel.org>,
Kousik Sanagavarapu <five231003@gmail.com>,
Hariom Verma <hariom18599@gmail.com>,
Jaydeep Das <jaydeepjd.8914@gmail.com>,
Nsengiyumva Wilberforce <nsengiyumvawilberforce@gmail.com>,
Christian Couder <christian.couder@gmail.com>
Subject: Re: [PATCH] t6300: fix setup with GPGSSH but without GPG
Date: Mon, 17 Jul 2023 09:22:55 -0700 [thread overview]
Message-ID: <xmqqwmyyik2o.fsf@gitster.g> (raw)
In-Reply-To: <cbc22750-af93-9274-2ed4-6dfd356568e8@web.de> ("René Scharfe"'s message of "Sun, 16 Jul 2023 10:17:35 +0200")
René Scharfe <l.s.r@web.de> writes:
> In a test introduced by 26c9c03f0a (ref-filter: add new "signature"
> atom, 2023-06-04) the file named "file" is added by a setup step that
> requires GPG and modified by a second setup step that requires GPGSSH.
> Systems lacking the first prerequisite skip the initial setup step and
> then "git commit -a" in the second one doesn't find the modified file.
> Add it explicitly.
>
> Signed-off-by: René Scharfe <l.s.r@web.de>
> ---
> t/t6300-for-each-ref.sh | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
Thanks for good eyes.
I guess a box without GPG is not so uncommon, and even such a box
can reasonably be expected to have SSH on it, so I would believe if
this was discovered on a real development box, but is that how you
found this? Or have you invented a nice test helper that lets you
pick random set of prerequisites and try permutations of having and
not having them, or something nice like that?
Will queue.
> diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
> index 6e6ec852b5..1180c3254c 100755
> --- a/t/t6300-for-each-ref.sh
> +++ b/t/t6300-for-each-ref.sh
> @@ -1584,7 +1584,8 @@ test_expect_success GPGSSH 'setup for signature atom using ssh' '
> test_config user.signingkey "${GPGSSH_KEY_PRIMARY}" &&
> echo "8" >file &&
> test_tick &&
> - git commit -a -S -m "file: 8" &&
> + git add file &&
> + git commit -S -m "file: 8" &&
> git tag eighth-signed-ssh
> '
>
> --
> 2.41.0
next prev parent reply other threads:[~2023-07-17 16:23 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-16 8:17 [PATCH] t6300: fix setup with GPGSSH but without GPG René Scharfe
2023-07-17 6:33 ` Christian Couder
2023-07-17 16:22 ` Junio C Hamano [this message]
2023-07-17 17:12 ` René Scharfe
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=xmqqwmyyik2o.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=christian.couder@gmail.com \
--cc=five231003@gmail.com \
--cc=git@vger.kernel.org \
--cc=hariom18599@gmail.com \
--cc=jaydeepjd.8914@gmail.com \
--cc=l.s.r@web.de \
--cc=nsengiyumvawilberforce@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).