undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dk/describe-all-output-fix'

Browse Source 
An old regression in "git describe --all $annotated_tag^0" has been
fixed.

* dk/describe-all-output-fix:
  describe: prepend "tags/" when describing tags with embedded name
This commit is contained in:
Junio C Hamano 2018-01-23 13:16:28 -08:00
commit fac64e011f
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/describe.c
View File

@ -274,10 +274,13 @@ static void append_name(struct commit_name *n, struct strbuf *dst)
n->name_checked = 1; n->name_checked = 1;
} }
if (n->tag) if (n->tag) {
if (all)
strbuf_addstr(dst, "tags/");
strbuf_addstr(dst, n->tag->tag); strbuf_addstr(dst, n->tag->tag);
else } else {
strbuf_addstr(dst, n->path); strbuf_addstr(dst, n->path);
}
} }
static void append_suffix(int depth, const struct object_id *oid, struct strbuf *dst) static void append_suffix(int depth, const struct object_id *oid, struct strbuf *dst)

6
t/t6120-describe.sh
View File

@ -122,7 +122,7 @@ test_expect_success 'describe --contains defaults to HEAD without commit-ish' '
' '
: >err.expect : >err.expect
check_describe A --all A^0 check_describe tags/A --all A^0
test_expect_success 'no warning was displayed for A' ' test_expect_success 'no warning was displayed for A' '
test_cmp err.expect err.actual test_cmp err.expect err.actual
' '
@ -374,4 +374,8 @@ test_expect_success ULIMIT_STACK_SIZE 'describe works in a deep repo' '
test_cmp expect actual test_cmp expect actual
' '
check_describe tags/A --all A
check_describe tags/c --all c
check_describe heads/branch_A --all --match='branch_*' branch_A
test_done test_done