"Kyle J. McKay" <mack...@gmail.com> writes:
> diff --git a/test-url-normalize.c b/test-url-normalize.c
> index d68312d..f325571 100644
> --- a/test-url-normalize.c
> +++ b/test-url-normalize.c
> @@ -9,7 +9,7 @@ int main()
>
> #include "http.c"
>
> -#define url_normalize(u) http_options_url_normalize(u)
> +#define url_normalize(u,i) http_options_url_normalize(u,i)
>
> int main(int argc, char **argv)
> {
> @@ -40,21 +40,22 @@ int main(int argc, char **argv)
> die(usage);
>
> if (argc == 2) {
> - url1 = url_normalize(argv[1]);
> + struct url_info info;
> + url1 = url_normalize(argv[1], &info);
> if (!url1)
> return 1;
> if (opt_p)
> printf("%s\n", url1);
> if (opt_l)
> - printf("%u\n", (unsigned)strlen(url1));
> + printf("%u\n", (unsigned)info.url_len);
> return 0;
> }
>
> if (opt_p || opt_l)
> die(usage);
>
> - url1 = url_normalize(argv[1]);
> - url2 = url_normalize(argv[2]);
> + url1 = url_normalize(argv[1], NULL);
> + url2 = url_normalize(argv[2], NULL);
> return (url1 && url2 && !strcmp(url1, url2)) ? 0 : 1;
> }
It looks like that this program could also drive http_options()
directly, or alternatively make a call
git_config(http_options, &info);
in its main() to let the config parser do its work, to make sure
that the machinery picks up the right values from the desired entry
in the configuration file, with a bit more effort.
> +static int match_is_ignored(size_t matchlen, int usermatch, enum
> http_option_type opt)
> {
> /*
> - * Compare matchlen to the last matched length of option opt and
> + * Compare matchlen to the last matched path length of option opt and
> * return true if matchlen is shorter than the last matched length
> * (meaning the config setting should be ignored). Upon seeing the
> * _same_ key (i.e. new key has the same match length which is therefore
> - * not shorter) the new setting will override the previous setting.
> - * Otherwise return false and record matchlen as the current last
> - * matched length of option opt.
> + * not shorter) the new setting will override the previous setting
> + * unless the new setting did not match the user and the previous match
> + * did. Otherwise return false and record matchlen as the current last
> + * matched path length of option opt and usermatch as the last user
> + * matching state for option opt.
> */
> if (matchlen < http_option_max_matched_len[opt])
> return 1;
> - http_option_max_matched_len[opt] = matchlen;
> + if (matchlen > http_option_max_matched_len[opt]) {
> + http_option_max_matched_len[opt] = matchlen;
> + http_option_user_matched[opt] = usermatch;
> + return 0;
> + }
> + /*
> + * If a previous match of the same length explicitly matched the user
> + * name, but the current match matched on any user, ignore it.
> + */
> + if (!usermatch && http_option_user_matched[opt])
> + return 1;
> + http_option_user_matched[opt] = usermatch;
> return 0;
> }
OK, so if there is a configuration for a generic URL that is longer,
it defeats a shorter URL with a specific username, e.g. when talking
to host.xz/name as kyle, with configuration for these two keys
exist:
scheme://k...@host.xz/path
scheme://host.xz/path/name
the value for the latter one is used.
I am not complaining; just making sure that is what we want to give
users, as it was not quite clear in the Documentation/config.txt
part of the patch.
Thanks.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
