diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-01-23 15:59:21 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-23 15:59:21 -0800 |
| commit | 1ac244d5b20a9ea4a640e2ee80b9818f564aa237 (patch) | |
| tree | 0b2be044f570e6ba9cdcd429aca5c62745ffd6db /Documentation/git-tag.txt | |
| parent | 8ec68d1ae2863823b74d67c5e92297e38bbf97bc (diff) | |
| parent | c026557a37361b7019acca28f240a19f546739e9 (diff) | |
| download | git-1ac244d5b20a9ea4a640e2ee80b9818f564aa237.tar.gz | |
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
Diffstat (limited to 'Documentation/git-tag.txt')
| -rw-r--r-- | Documentation/git-tag.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt index 76cfe40d96..5055a96823 100644 --- a/Documentation/git-tag.txt +++ b/Documentation/git-tag.txt @@ -101,8 +101,8 @@ OPTIONS multiple times, in which case the last key becomes the primary key. Also supports "version:refname" or "v:refname" (tag names are treated as versions). The "version:refname" sort - order can also be affected by the - "versionsort.prereleaseSuffix" configuration variable. + order can also be affected by the "versionsort.suffix" + configuration variable. The keys supported are the same as those in `git for-each-ref`. Sort order defaults to the value configured for the `tag.sort` variable if it exists, or lexicographic order otherwise. See |