From: Junio C Hamano <gitster@pobox.com>
To: Matheus Tavares <matheus.bernardino@usp.br>
Cc: git@vger.kernel.org, peff@peff.net, rhi@pengutronix.de
Subject: Re: [PATCH] describe: output tag's ref instead of embedded name
Date: Thu, 20 Feb 2020 18:05:15 -0800 [thread overview]
Message-ID: <xmqqsgj47l0k.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20200221013357.26795-1-matheus.bernardino@usp.br> (Matheus Tavares's message of "Thu, 20 Feb 2020 22:33:57 -0300")
Matheus Tavares <matheus.bernardino@usp.br> writes:
>> > Another case that came to my mind is when the user runs `git describe
>> > --abrev=0 HEAD` and v1.0-bob points to HEAD~. In this case, v1.0 will
>> > be displayed without suffix,...
>>
>> In this case, v1.0-1- is followed by the full object name, I think.
>
> I might be doing something wrong, but this is how I tried to test this:...
I only tried the commit exactly at the tag "describe --abbrev=0 v1.0-bob^0";
you're right---the "abbrev" option strips the suffix in a separate codepath.
> Then we cannot directly use the output. I think we can fix this forcing the long
> output for this case as well, which can be done with:
Thanks for a quick fix on top.
builtin/describe.c | 2 +-
t/t6120-describe.sh | 12 ++++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/builtin/describe.c b/builtin/describe.c
index 5e8484f654..f71bddff4a 100644
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -452,7 +452,7 @@ static void describe_commit(struct object_id *oid, struct strbuf *dst)
}
append_name(all_matches[0].name, dst);
- if (abbrev)
+ if (all_matches[0].name->misnamed || abbrev)
append_suffix(all_matches[0].depth, &cmit->object.oid, dst);
if (suffix)
strbuf_addstr(dst, suffix);
diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index 16a261c45d..8f35f18c3f 100755
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@ -144,6 +144,18 @@ test_expect_success 'misnamed annotated tag forces long output' '
test_cmp expect actual
'
+test_expect_success 'abbrev=0 will not break misplaced tag (1)' '
+ description=$(git describe --abbrev=0 Q^0) &&
+ expr "$description" : "A-0-g[0-9a-f]*$"
+'
+
+test_expect_success 'abbrev=0 will not break misplaced tag (2)' '
+ description=$(git describe --abbrev=0 c^0) &&
+ expr "$description" : "A-1-g[0-9a-f]*$"
+'
+
+exit
+
test_expect_success 'rename tag Q back to A' '
mv .git/refs/tags/Q .git/refs/tags/A
'
next prev parent reply other threads:[~2020-02-21 2:05 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-05 14:13 git-describe --tags warning: 'X' is really 'Y' here Roland Hieber
2020-02-05 17:15 ` Matheus Tavares Bernardino
2020-02-14 6:53 ` Jeff King
2020-02-14 16:57 ` Junio C Hamano
2020-02-15 21:34 ` [PATCH] describe: output tag's ref instead of embedded name Matheus Tavares
2020-02-16 6:51 ` Jeff King
2020-02-18 19:31 ` Junio C Hamano
2020-02-18 19:54 ` Jeff King
2020-02-18 23:05 ` Junio C Hamano
2020-02-18 23:28 ` Junio C Hamano
2020-02-19 1:57 ` Jeff King
2020-02-19 3:22 ` Junio C Hamano
2020-02-19 3:56 ` Jeff King
2020-02-19 11:14 ` Junio C Hamano
2020-02-20 11:25 ` Jeff King
2020-02-20 17:34 ` Junio C Hamano
2020-02-20 22:19 ` Matheus Tavares Bernardino
2020-02-20 22:59 ` Junio C Hamano
2020-02-21 1:33 ` Matheus Tavares
2020-02-21 2:05 ` Junio C Hamano [this message]
2020-02-21 6:00 ` Jeff King
2020-02-21 5:58 ` Jeff King
2020-02-19 10:08 ` Roland Hieber
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=xmqqsgj47l0k.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=matheus.bernardino@usp.br \
--cc=peff@peff.net \
--cc=rhi@pengutronix.de \
/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).