Merge branch 'sg/fix-versioncmp-with-common-suffix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 23 Jan 2017 23:59:21 +0000 (15:59 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 Jan 2017 23:59:21 +0000 (15:59 -0800)
commit1ac244d5b20a9ea4a640e2ee80b9818f564aa237
tree0b2be044f570e6ba9cdcd429aca5c62745ffd6db
parent8ec68d1ae2863823b74d67c5e92297e38bbf97bc
parentc026557a37361b7019acca28f240a19f546739e9
Merge branch 'sg/fix-versioncmp-with-common-suffix'

The prereleaseSuffix feature of version comparison that is used in
"git tag -l" did not correctly when two or more prereleases for the
same release were present (e.g. when 2.0, 2.0-beta1, and 2.0-beta2
are there and the code needs to compare 2.0-beta1 and 2.0-beta2).

* sg/fix-versioncmp-with-common-suffix:
  versioncmp: generalize version sort suffix reordering
  versioncmp: factor out helper for suffix matching
  versioncmp: use earliest-longest contained suffix to determine sorting order
  versioncmp: cope with common part overlapping with prerelease suffix
  versioncmp: pass full tagnames to swap_prereleases()
  t7004-tag: add version sort tests to show prerelease reordering issues
  t7004-tag: use test_config helper
  t7004-tag: delete unnecessary tags with test_when_finished
Documentation/config.txt
Documentation/git-tag.txt
t/t7004-tag.sh