diff options
Diffstat (limited to 'versioncmp.c')
| -rw-r--r-- | versioncmp.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/versioncmp.c b/versioncmp.c index 4cb400f901..9f81dc1062 100644 --- a/versioncmp.c +++ b/versioncmp.c @@ -159,8 +159,15 @@ int versioncmp(const char *s1, const char *s2) } if (!initialized) { + const struct string_list *deprecated_prereleases; initialized = 1; - prereleases = git_config_get_value_multi("versionsort.prereleasesuffix"); + prereleases = git_config_get_value_multi("versionsort.suffix"); + deprecated_prereleases = git_config_get_value_multi("versionsort.prereleasesuffix"); + if (prereleases) { + if (deprecated_prereleases) + warning("ignoring versionsort.prereleasesuffix because versionsort.suffix is set"); + } else + prereleases = deprecated_prereleases; } if (prereleases && swap_prereleases(s1, s2, (const char *) p1 - s1 - 1, &diff)) |