On Tue, Dec 06, 2016 at 01:10:08PM -0500, Jeff King wrote: > > I think I merged yours and then Brandon's on jch/pu branches in that > > order, and the conflict resolution should look OK. > > > > I however forked yours on v2.11.0-rc1, which would need to be > > rebased to one of the earlier maintenance tracks, before we can > > merge it to 'next'. > > Yeah, I built it on top of master. > > It does depend on some of the http-walker changes Eric made a few months > ago. In particular, 17966c0a6 (http: avoid disconnecting on 404s for > loose objects, 2016-07-11) added some checks against the HTTP status > code, and my series modifies the checks (mostly so that ">= 400" becomes > ">= 300"). > > Rebasing on maint-2.9 means omitting those changes. That preserves the > security properties, but means that the error handling is worse when we > see an illegal redirect. That may be OK, though. > > Since the resolution is to omit the changes entirely from my series, > merging up to v2.11 wouldn't produce any conflicts. We'd need to have a > separate set of patches adding those changes back in. This actually turned out to be pretty easy. The final patch from my original series is the one that tweaks the error-handling from 17966c0a6. The rest of them are _almost_ untouched, except that one of the error-handling tweaks gets bumped to the final patch. So here's a resend of the patches, rebased on your maint-2.9 branch. Patches 1-5 should be applied directly there. On maint-2.10, you can merge up maint-2.9, and then apply patch 6. Hopefully that makes sense, but I've pushed branches jk/maint-X-http-redirect to https://github.com/peff/git that show the final configuration (and a diff of jk/maint-2.10-http-redirect shows the outcome is identical to applying the original series on top of 2.10). Merging up to 2.11 should be trivial. [1/6]: http: simplify update_url_from_redirect [2/6]: http: always update the base URL for redirects [3/6]: remote-curl: rename shadowed options variable [4/6]: http: make redirects more obvious [5/6]: http: treat http-alternates like redirects [6/6]: http-walker: complain about non-404 loose object errors -Peff