From: Matheus Tavares <matheus.bernardino@usp.br>
To: gitster@pobox.com
Cc: git@vger.kernel.org, matheus.bernardino@usp.br, peff@peff.net,
rhi@pengutronix.de
Subject: Re: [PATCH] describe: output tag's ref instead of embedded name
Date: Thu, 20 Feb 2020 22:33:57 -0300 [thread overview]
Message-ID: <20200221013357.26795-1-matheus.bernardino@usp.br> (raw)
In-Reply-To: <xmqqftf49862.fsf@gitster-ct.c.googlers.com>
On Thu, Feb 20, 2020 at 7:59 PM Junio C Hamano <gitster@pobox.com> wrote:
>
> Matheus Tavares Bernardino <matheus.bernardino@usp.br> writes:
>
> > I now this is just an illustration, but shouldn't this example be "git
> > describe --contains v1.0-bob~1"?
>
> No, none of the patches discussed in this thread would not affect
> anything in --contains (as it is a completely different program).
Ok, thanks for the clarification.
> > 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: First I
set the desired scenario with:
$ git tag -am "" v1.0 HEAD~
$ mv .git/refs/tags/v1.0 .git/refs/tags/v1.0-bob
Then, running git-describe on v1.0-bob^0 I got what we want, which is the forced
long output (even with --abbrev=0):
$ git describe --abbrev=0 HEAD~
warning: tag 'v1.0-bob' is externally known as 'v1.0'
v1.0-0-g310a1f27be54ecf16fd36ff987304c1a2f8524b5
But running on the commit after v1.0-bob^0, I got:
$ git describe --abbrev=0 HEAD
warning: tag 'v1.0-bob' is externally known as 'v1.0'
v1.0
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:
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);
next prev parent reply other threads:[~2020-02-21 1:34 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 [this message]
2020-02-21 2:05 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200221013357.26795-1-matheus.bernardino@usp.br \
--to=matheus.bernardino@usp.br \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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.
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).