Re: [PATCH v9 1/1] http: Add Accept-Language header if possible
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Feb 26, 2015, 22:13 UTC
- Message-ID
- <xmqq1tlcl3sz.fsf@gitster.dls.corp.google.com>
- In-Reply-To
- <20150226220609.GA24663@peff.net>
Jeff King <peff@peff.net> writes:
Show 10 quoted lines
> On Thu, Feb 26, 2015 at 01:47:34PM -0800, Stefan Beller wrote: > >> On Thu, Feb 26, 2015 at 1:42 PM, Junio C Hamano <gitster@pobox.com> wrote:> >> > Here is what I queued. Thanks. >> >> I did not follow the thread if there are any intermediate patches, >> though it applied cleanly. > > What Junio posted is missing the hunk to drop the old static definition > of get_preferred_languages from http.c.
I am still scratching my head to see how this happened, but I think when I did
$ git checkout ye/http-accept-language
$ git apply -3 $gmane/264422I took the wrong side of the confict in http.c
Thanks both for noticing. Now it is fixed up.