diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-24 22:29:27 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-24 22:29:28 (GMT) |
| commit | e8d9d8b0bdb8c43c8c5e23c3a2fe99a1dcbe8015 (patch) | |
| tree | 898675080dcb9a5dcb9a3b0bf717142fbed86631 /t | |
| parent | fd99e2bda0ca6a361ef03c04d6d7fdc7a9c40b78 (diff) | |
| parent | ef1e74065c19cc427c4a1b322154fd55d7a3588b (diff) | |
| download | git-e8d9d8b0bdb8c43c8c5e23c3a2fe99a1dcbe8015.zip git-e8d9d8b0bdb8c43c8c5e23c3a2fe99a1dcbe8015.tar.gz git-e8d9d8b0bdb8c43c8c5e23c3a2fe99a1dcbe8015.tar.bz2 | |
Merge branch 'jc/name-rev-lw-tag' into maint
"git describe --contains" penalized light-weight tags so much that
they were almost never considered. Instead, give them about the
same chance to be considered as an annotated tag that is the same
age as the underlying commit would.
* jc/name-rev-lw-tag:
name-rev: favor describing with tags and use committer date to tiebreak
name-rev: refactor logic to see if a new candidate is a better name
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4202-log.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4202-log.sh b/t/t4202-log.sh index 1c7d672..6499cdf 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -399,7 +399,7 @@ cat > expect <<\EOF | | | | Merge branch 'side' | | -| * commit side +| * commit tags/side-2 | | Author: A U Thor <author@example.com> | | | | side-2 |