Re: [PATCH 1/2] diff: document behavior of relative diff.orderFile

From: Jeff King <peff@peff.net>
Date: Jan 10, 2017, 06:58 UTC
Message-ID: <20170110065816.pu325sxajbyuqpj6@sigill.intra.peff.net>
In-Reply-To: <20170110004031.57985-2-hansenr@google.com>

On Mon, Jan 09, 2017 at 07:40:30PM -0500, Richard Hansen wrote:

Show 19 quoted lines

> Document that a relative pathname for diff.orderFile is interpreted as
> relative to the top-level work directory.
> 
> Signed-off-by: Richard Hansen <hansenr@google.com>
> ---
>  Documentation/diff-config.txt | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt
> index 58f4bd6af..875212045 100644
> --- a/Documentation/diff-config.txt
> +++ b/Documentation/diff-config.txt
> @@ -101,6 +101,8 @@ diff.noprefix::
>  diff.orderFile::
>  	File indicating how to order files within a diff, using
>  	one shell glob pattern per line.
> +	If `diff.orderFile` is a relative pathname, it is treated as
> +	relative to the top of the work tree.
>  	Can be overridden by the '-O' option to linkgit:git-diff[1].

What happens in a bare repository?

I'm guessing it's relative to the top-level of the repository, but we should probably spell it out.

The other case is --no-index when we are not in a repository at all, but that should just be relative to the current directory, which isn't really worth mentioning.

-Peff