Re: [PATCH 2/7] diff.c: take "prefix" argument in diff_opt_parse()

From: Junio C Hamano <gitster@pobox.com>
Date: Jan 20, 2016, 21:49 UTC
Message-ID: <xmqqh9i753by.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <20160120202946.GA6092@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

Show 23 quoted lines

> On Wed, Jan 20, 2016 at 12:23:38PM -0800, Junio C Hamano wrote:
>
>> Nguyễn Thái Ngọc Duy  <pclouds@gmail.com> writes:
>> 
>> > This will be important later when diff_opt_parse() accepts paths as
>> > arguments. Paths must be prefixed before access because setup code
>> > moves cwd but does not (and cannot) update command line options.
>> 
>> The above sounds like a sensible thing to do (note: I didn't read
>> the patch or remainder of the series), but makes me wonder how the
>> existing --orderfile option works without this support.  Perhaps it
>> is not working and needs to be updated to take advantage of this
>> change, too?
>
> Yeah, I think it simply does not work.
>
>   $ >main-order
>   $ mkdir subdir && >subdir/sub-order
>   $ cd subdir
>   $ git show -Osub-order
>   fatal: failed to read orderfile 'sub-order': No such file or directory
>   $ git show -Omain-order
>   [shows diff]

Good.

Then 2/7 can be rerolled and advertised as "make -O to work from subdirectories", and can gradulate regardless of the remainder of the series. Even if the rest needs rerolls to get it right (or takes until 2019 to mature ;-), we will have one less change to re-review in the process as we can push these early and obviously correct part out separately.