log: properly handle decorations with chained tags
git log did not correctly handle decorations when a tag object referenced another tag object that was no longer a ref, such as when the second tag was deleted. The commit would not be decorated correctly because parse_object had not been called on the second tag and therefore its tagged field had not been filled in, resulting in none of the tags being associated with the relevant commit. Call parse_object to fill in this field if it is absent so that the chain of tags can be dereferenced and the commit can be properly decorated. Include tests as well to prevent future regressions. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
brian m. carlson committed
Dec 17, 2013 at 04:28 UTC
5e1361ccdbfaf328b5bae1eae29f16ba965c54b1
2 files changed
+17
log-tree.c
+2
@@ -134,6 +134,8 @@ static int add_ref_decoration(const char *refname, const unsigned char *sha1, in
134
obj = ((struct tag *)obj)->tagged;
135
if (!obj)
136
break;
137
+ if (!obj->parsed)
138
+ parse_object(obj->sha1);
139
add_name_decoration(DECORATION_REF_TAG, refname, obj);
140
}
141
return 0;
t/t4205-log-pretty-formats.sh
+15
@@ -310,4 +310,19 @@ EOF
310
test_cmp expected actual
311
'
312
313
+test_expect_success 'log decoration properly follows tag chain' '
314
+ git tag -a tag1 -m tag1 &&
315
+ git tag -a tag2 -m tag2 tag1 &&
316
+ git tag -d tag1 &&
317
+ git commit --amend -m shorter &&
318
+ git log --no-walk --tags --pretty="%H %d" --decorate=full >actual &&
319
+ cat <<EOF >expected &&
320
+6a908c10688b2503073c39c9ba26322c73902bb5 (tag: refs/tags/tag2)
321
+9f716384d92283fb915a4eee5073f030638e05f9 (tag: refs/tags/message-one)
322
+b87e4cccdb77336ea79d89224737be7ea8e95367 (tag: refs/tags/message-two)
323
+EOF
324
+ sort actual >actual1 &&
325
+ test_cmp expected actual1
326
+'
327
+
328
test_done