{"thread":{"id":"12459","subject":"[PATCH] describe: fix --long output","startedAt":"2008-03-03T14:37:46Z","lastAt":"2008-03-03T14:37:46Z","messageCount":1,"participants":["Santi Béjar"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"70789","messageId":"1204555066-8820-1-git-send-email-sbejar@gmail.com","threadId":"12459","inReplyTo":null,"subject":"[PATCH] describe: fix --long output","fromName":"Santi Béjar","fromEmail":"sbejar@gmail.com","sentAt":"2008-03-03T14:37:46Z","receivedAt":"2008-03-03T14:37:46Z","isPatch":true,"sender":{"key":"santi@agolina.net","avatar":null},"body":"Without this the output is:\n\n$ git describe --long origin/next\nv1.5.4.3-0-g31e0b2c-500-g83a2cbb\n\nIt was introduced in the conflicting part of\nb00ac8c (Merge branch 'sp/describe-tag')\n\nSigned-off-by: Santi Béjar <sbejar@gmail.com>\n---\n builtin-describe.c |    6 +++---\n 1 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/builtin-describe.c b/builtin-describe.c\nindex 2f1e7ba..7ba822a 100644\n--- a/builtin-describe.c\n+++ b/builtin-describe.c\n@@ -166,9 +166,6 @@ static void display_name(struct commit_name *n)\n \t\tprintf(\"%s\", n->tag->tag);\n \telse\n \t\tprintf(\"%s\", n->path);\n-\tif (longformat)\n-\t\tprintf(\"-0-g%s\",\n-\t\t       find_unique_abbrev(n->tag->tagged->sha1, abbrev));\n }\n \n static void describe(const char *arg, int last_one)\n@@ -196,6 +193,9 @@ static void describe(const char *arg, int last_one)\n \tn = cmit->util;\n \tif (n) {\n \t\tdisplay_name(n);\n+\t\tif (longformat)\n+\t\t\tprintf(\"-0-g%s\",\n+\t\t\t\tfind_unique_abbrev(n->tag->tagged->sha1, abbrev));\n \t\tprintf(\"\\n\");\n \t\treturn;\n \t}\n-- \n1.5.4.3.488.g7b3a6\n\n"}]}