From: Junio C Hamano Date: Mon, 23 Jan 2017 23:59:21 +0000 (-0800) Subject: Merge branch 'sg/fix-versioncmp-with-common-suffix' X-Git-Tag: v2.12.0-rc0~49 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1ac244d5b20a9ea4a640e2ee80b9818f564aa237;p=git 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 --- 1ac244d5b20a9ea4a640e2ee80b9818f564aa237