Re: [PATCH] archive: clarify explanation of --worktree-attributes

From: Junio C Hamano <gitster@pobox.com>
Date: Apr 10, 2013, 18:56 UTC
Message-ID: <7vd2u2mcyy.fsf@alter.siamese.dyndns.org>
In-Reply-To: <5165A645.9090300@lsrfire.ath.cx>

René Scharfe <rene.scharfe@lsrfire.ath.cx> writes:

Show 9 quoted lines

> Make it a bit clearer that --worktree-attributes is about files in the
> working tree (checked out files, possibly changed) and not the current
> working directory ($PDW).  Link to the ATTRIBUTES section, which has
> more details.
>
> Reported-by: Amit Bakshi <ambakshi@gmail.com>
> Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
> ---
> Does this help a bit?

I personally thought that the original was already clear enough (especially when taken in the context of Git), but the new wording is not too verbose and should help avoiding misinterpretation.

Thanks.

Show 18 quoted lines

>
>  Documentation/git-archive.txt | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt
> index b4c2e24..3dd3069 100644
> --- a/Documentation/git-archive.txt
> +++ b/Documentation/git-archive.txt
> @@ -56,7 +56,8 @@ OPTIONS
>  	Write the archive to <file> instead of stdout.
>  
>  --worktree-attributes::
> -	Look for attributes in .gitattributes in working directory too.
> +	Look for attributes in .gitattributes files in the working tree
> +	as well (see <<ATTRIBUTES>>).
>  
>  <extra>::
>  	This can be any options that the archiver backend understands.