From: "René Scharfe." <l.s.r@web.de>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: Eli Schwartz <eschwartz@archlinux.org>,
git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 1/2] pretty: add %(describe)
Date: Sun, 28 Feb 2021 12:22:26 +0100 [thread overview]
Message-ID: <b70e1b3a-dd5f-1fbc-22d5-e2bca4c00e79@web.de> (raw)
In-Reply-To: <87k0r7a4sr.fsf@evledraar.gmail.com>
Am 17.02.21 um 01:58 schrieb Ævar Arnfjörð Bjarmason:
>
> On Sun, Feb 14 2021, René Scharfe wrote:
>
>> +'%(describe)':: human-readable name, like linkgit:git-describe[1];
>> + empty string for undescribable commits
>
> In the case of undescribable we've got the subcommand exiting non-zero
> and we ignore it. The right thing in this case given how the rest of
> format arguments work, but maybe something to explicitly test for?
The test convers it, but we can surely make that easier to see.
-- >8 --
Subject: [PATCH] t4205: assert %(describe) test coverage
Document that the test is covering both describable and
undescribable commits.
Suggested-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: René Scharfe <l.s.r@web.de>
---
t/t4205-log-pretty-formats.sh | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh
index b47a0bd9eb..cabdf7d57a 100755
--- a/t/t4205-log-pretty-formats.sh
+++ b/t/t4205-log-pretty-formats.sh
@@ -965,8 +965,17 @@ test_expect_success 'log --pretty=reference is colored appropriately' '
test_expect_success '%(describe) vs git describe' '
git log --format="%H" | while read hash
do
- echo "$hash $(git describe $hash)"
+ if desc=$(git describe $hash)
+ then
+ : >expect-contains-good
+ else
+ : >expect-contains-bad
+ fi &&
+ echo "$hash $desc"
done >expect &&
+ test_path_exists expect-contains-good &&
+ test_path_exists expect-contains-bad &&
+
git log --format="%H %(describe)" >actual 2>err &&
test_cmp expect actual &&
test_must_be_empty err
--
2.30.1
next prev parent reply other threads:[~2021-02-28 11:24 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-25 0:32 gitattributes export-subst and software versioning Eli Schwartz
2021-02-08 19:46 ` René Scharfe
2021-02-08 22:41 ` Junio C Hamano
2021-02-09 0:19 ` Eli Schwartz
2021-02-09 20:42 ` Junio C Hamano
2021-02-14 10:04 ` René Scharfe
2021-02-14 10:04 ` René Scharfe
2021-02-14 10:04 ` [PATCH 1/2] pretty: add %(describe) René Scharfe
2021-02-14 10:10 ` [PATCH 2/2] pretty: add merge and exclude options to %(describe) René Scharfe.
2021-02-17 18:31 ` Jeff King
2021-02-28 11:22 ` René Scharfe.
2021-02-28 15:41 ` Ævar Arnfjörð Bjarmason
2021-03-02 16:00 ` René Scharfe.
2021-03-06 16:18 ` René Scharfe.
[not found] ` <xmqqy2f6rc8f.fsf@gitster.c.googlers.com>
2021-03-02 16:00 ` René Scharfe.
[not found] ` <xmqqsg5uletz.fsf@gitster.g>
2021-02-28 11:22 ` René Scharfe.
2021-02-16 5:04 ` [PATCH 1/2] pretty: add %(describe) Eli Schwartz
2021-02-16 13:00 ` Ævar Arnfjörð Bjarmason
2021-02-16 17:13 ` René Scharfe.
2021-02-16 18:44 ` Junio C Hamano
2021-02-17 0:47 ` Ævar Arnfjörð Bjarmason
2021-02-28 11:22 ` René Scharfe.
[not found] ` <xmqq35xesqzk.fsf@gitster.c.googlers.com>
2021-03-02 16:00 ` René Scharfe.
2021-02-17 0:58 ` Ævar Arnfjörð Bjarmason
2021-02-17 18:12 ` Junio C Hamano
2021-02-28 11:22 ` René Scharfe. [this message]
[not found] ` <xmqq7dmqsr72.fsf@gitster.c.googlers.com>
2021-03-02 16:00 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b70e1b3a-dd5f-1fbc-22d5-e2bca4c00e79@web.de \
--to=l.s.r@web.de \
--cc=avarab@gmail.com \
--cc=eschwartz@archlinux.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).