Re: [RFC v3 3/3] diff: Add diff.orderfile configuration variable

From: Junio C Hamano <gitster@pobox.com>
Date: Dec 16, 2013, 18:53 UTC
Message-ID: <xmqqfvpspqyj.fsf@gitster.dls.corp.google.com>
In-Reply-To: <1387059521-23616-4-git-send-email-naesten@gmail.com>

Samuel Bronson <naesten@gmail.com> writes:

Show 6 quoted lines

> diff.orderfile acts as a default for the -O command line option.
>
> [sb: split up aw's original patch; reworked tests and docs]
>
> [FIXME: Relative paths should presumably be interpreted relative to
> repository root; how should this be accomplished?]

Do you mean something like this?

    $ cd docs
    $ edit orderfile
    $ git diff -Oordefile
    $ cd subdir
    $ git diff -O../orderfile

Path-like parameters and values given by the end user should be relative to the directory where the end user is (i.e. both -O parameters in the above example name docs/orderfile). All Git processes, even the ones that are capable of being run from a subdirectory, are supposed to first chdir to the top level of the working tree before doing anything else, and adjust the path-like things they get from the end user from the command line accordingly. By the time diffcore_order() to prepare_order() callchain is called, we certainly should have passed that chdir already, so the value of the option needs to be prepended with the "prefix" when parsed.

The value specified for the diff.orderfile configuration can just be a path relative to the top level of the working tree, I think.