Jeff King venit, vidit, dixit 14.10.2011 15:19: > On Fri, Oct 14, 2011 at 09:40:34AM +0200, Michael J Gruber wrote: > >> Here are the early parts of Jeff's http-auth-keyring series. >> It contains only parts which are not using the credential API (which >> is still under discussion), so that this can go in (and help users) >> and alleviates the pressure on the credential discussion: >> >> Early bits with cleanups to http.c. >> Cherry-picked bit for improved prompts ("Username for ..." etc.) >> Cherry-pickes bit for using configured pushurls. >> >> I tried to pick/resolve in a way which should help rebasing Jeff's series >> on top of this. > > Thanks for working on this. One of my intended tasks for today is to > rebase my series, so it is nice to wake up to half of the work done. :) Good morning :) >> Jeff King (5): >> url: decode buffers that are not NUL-terminated >> improve httpd auth tests >> remote-curl: don't retry auth failures with dumb protocol >> http: retry authentication failures for all http requests >> http_init: accept separate URL parameter >> >> Michael J Gruber (1): >> http: use hostname in credential description > > Your changes all look right. The naming of git_getpass_one in the > cherry-picked commit is a little odd without the rest of the series as > context. I would maybe have called it "git_getpass_with_description" or > something. git_getpass_my_life_will_be_short_and_ended_by_credentials I don't care. In fact, I wasn't sure whether I should I even change the author on this one. It's not a straight resolution and does involve choices, but the meat is from your series. Michael -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html