From: Junio C Hamano <gitster@pobox•com>
To: Jeff King <peff@peff•net>
Cc: "Nguyễn Thái Ngọc Duy" <pclouds@gmail•com>, git@vger•kernel.org
Subject: Re: [PATCH 2/7] diff.c: take "prefix" argument in diff_opt_parse()
Date: Wed, 20 Jan 2016 13:49:21 -0800 [thread overview]
Message-ID: <xmqqh9i753by.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20160120202946.GA6092@sigill.intra.peff.net> (Jeff King's message of "Wed, 20 Jan 2016 15:29:46 -0500")
Jeff King <peff@peff•net> writes:
> 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.
next prev parent reply other threads:[~2016-01-20 21:49 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-20 11:06 [PATCH 0/7] Diff rename, manual correction, round 2 Nguyễn Thái Ngọc Duy
2016-01-20 11:06 ` [PATCH 1/7] diff-no-index: do not take a redundant prefix argument Nguyễn Thái Ngọc Duy
2016-01-20 11:06 ` [PATCH 2/7] diff.c: take "prefix" argument in diff_opt_parse() Nguyễn Thái Ngọc Duy
2016-01-20 20:23 ` Junio C Hamano
2016-01-20 20:29 ` Jeff King
2016-01-20 21:49 ` Junio C Hamano [this message]
2016-01-21 11:48 ` Duy Nguyen
2016-01-21 23:01 ` Junio C Hamano
2016-01-20 11:06 ` [PATCH 3/7] diff: add --rename-file Nguyễn Thái Ngọc Duy
2016-01-20 22:44 ` Junio C Hamano
2016-01-20 22:47 ` Junio C Hamano
2016-01-20 11:06 ` [PATCH 4/7] log: add --rename-notes to correct renames per commit Nguyễn Thái Ngọc Duy
2016-01-20 23:29 ` Junio C Hamano
2016-01-22 1:00 ` Duy Nguyen
2016-01-20 11:06 ` [PATCH 5/7] merge: add --rename-file Nguyễn Thái Ngọc Duy
2016-01-20 11:06 ` [PATCH 6/7] diffcore-rename: allow to say "rename this blob to that blob" Nguyễn Thái Ngọc Duy
2016-01-20 11:06 ` [PATCH 7/7] merge: add --rename-notes Nguyễn Thái Ngọc Duy
2016-01-21 17:53 ` Junio C Hamano
2016-01-22 3:35 ` Duy Nguyen
2016-01-22 17:17 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqh9i753by.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=pclouds@gmail$(echo .)com \
--cc=peff@peff$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox