Merge branch 'sg/fix-versioncmp-with-common-suffix' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Jan 2017 22:56:06 +0000 (14:56 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Jan 2017 22:56:06 +0000 (14:56 -0800)
commitf79c24a291a58845b08cfec7573e22cc153693e1
tree60e6a17ae298367bd8956e51c6e70ecc0cce89eb
parentac4915dbe6b7ec1c62920e22259284822f05d400
parentc026557a37361b7019acca28f240a19f546739e9
Merge branch 'sg/fix-versioncmp-with-common-suffix' into next

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