Browse Source

Merge branch 'bc/log-decoration' into maint

"git log --decorate" did not handle a tag pointed by another tag
nicely.

* bc/log-decoration:
  log: properly handle decorations with chained tags
maint
Junio C Hamano 11 years ago
parent
commit
d11ade701a
  1. 2
      log-tree.c
  2. 15
      t/t4205-log-pretty-formats.sh

2
log-tree.c

@ -134,6 +134,8 @@ static int add_ref_decoration(const char *refname, const unsigned char *sha1, in
obj = ((struct tag *)obj)->tagged; obj = ((struct tag *)obj)->tagged;
if (!obj) if (!obj)
break; break;
if (!obj->parsed)
parse_object(obj->sha1);
add_name_decoration(DECORATION_REF_TAG, refname, obj); add_name_decoration(DECORATION_REF_TAG, refname, obj);
} }
return 0; return 0;

15
t/t4205-log-pretty-formats.sh

@ -310,4 +310,19 @@ EOF
test_cmp expected actual test_cmp expected actual
' '


test_expect_success 'log decoration properly follows tag chain' '
git tag -a tag1 -m tag1 &&
git tag -a tag2 -m tag2 tag1 &&
git tag -d tag1 &&
git commit --amend -m shorter &&
git log --no-walk --tags --pretty="%H %d" --decorate=full >actual &&
cat <<EOF >expected &&
6a908c10688b2503073c39c9ba26322c73902bb5 (tag: refs/tags/tag2)
9f716384d92283fb915a4eee5073f030638e05f9 (tag: refs/tags/message-one)
b87e4cccdb77336ea79d89224737be7ea8e95367 (tag: refs/tags/message-two)
EOF
sort actual >actual1 &&
test_cmp expected actual1
'

test_done test_done

Loading…
Cancel
Save