Re: "git describe" documentation and behavior mismatch
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Dec 15, 2017, 19:25 UTC
- Message-ID
- <xmqqwp1npzd8.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <CACx-yZ3FxqFvXgM-V0stODcyAdCoO83s=WwyZ2OLiJON6qqvkA@mail.gmail.com>
Daniel Knittl-Frank <knittl89@googlemail.com> writes:
Show 15 quoted lines
> Forget the above patch. I should compile my code after refactoring ... > > Here is the fixed version. > > -- >8 -- > > From 8203bd0ad5baab7024ebff597c9f35a0250d09ff Mon Sep 17 00:00:00 2001 > From: Daniel Knittl-Frank <knittl89+git@googlemail.com> > Date: Mon, 11 Dec 2017 19:24:54 +0100 > Subject: [PATCH] Prepend "tags/" when describing tags with embedded name > > Signed-off-by: Daniel Knittl-Frank <knittl89+git@googlemail.com> > --- > builtin/describe.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-)
I think the code makes sense, but it won't be understandable by those who do not know what you discussed in the original thread.
A proper commit log message, with a new test or two in t6120, would be an appropriate way to fix that.
Care to follow through, along the lines in Documentation/SubmittingPatches?
Thanks.
Show 22 quoted lines
> diff --git a/builtin/describe.c b/builtin/describe.c
> index e14e162ef6..9da6d85ea3 100644
> --- a/builtin/describe.c
> +++ b/builtin/describe.c
> @@ -271,10 +271,13 @@ static void display_name(struct commit_name *n)
> n->name_checked = 1;
> }
>
> - if (n->tag)
> + if (n->tag) {
> + if (all)
> + printf("tags/");
> printf("%s", n->tag->tag);
> - else
> + } else {
> printf("%s", n->path);
> + }
> }
>
> static void show_suffix(int depth, const struct object_id *oid)
> --
> 2.15.GIT