diff options
Diffstat (limited to 'versioncmp.c')
| -rw-r--r-- | versioncmp.c | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/versioncmp.c b/versioncmp.c index 069ee94..45e676c 100644 --- a/versioncmp.c +++ b/versioncmp.c @@ -1,6 +1,8 @@ -#include "cache.h" +#include "git-compat-util.h" #include "config.h" +#include "strbuf.h" #include "string-list.h" +#include "versioncmp.h" /* * versioncmp(): copied from string/strverscmp.c in glibc commit @@ -160,15 +162,21 @@ int versioncmp(const char *s1, const char *s2) } if (!initialized) { - const struct string_list *deprecated_prereleases; + const char *const newk = "versionsort.suffix"; + const char *const oldk = "versionsort.prereleasesuffix"; + const struct string_list *newl; + const struct string_list *oldl; + int new = git_config_get_string_multi(newk, &newl); + int old = git_config_get_string_multi(oldk, &oldl); + + if (!new && !old) + warning("ignoring %s because %s is set", oldk, newk); + if (!new) + prereleases = newl; + else if (!old) + prereleases = oldl; + initialized = 1; - 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)) |