threads / discuss / 33451

git-archive --worktree-attributes (1.8.2)

Subject: git-archive --worktree-attributes (1.8.2)

## tl;dr

5 messages between Apr 9, 2013 and Apr 10, 2013.

replies: 4people: 4as markdown or json

Amit Bakshi· Apr 9, 2013, 20:43 UTC · lore
Hi,
 In the help for git-archive it states:
       --worktree-attributes
           Look for attributes in .gitattributes in working directory too.

This doesn't seem to be the case. I have a use case where I need to archive a remote I don't have write access too (via --remote=), and I wish to ignore certain paths. When I chdir to a temp dir, create a .gitattributes file, and call git archive --worktree-attributes, the bevaviour I see is that it is ignoring .gitattributes. I've tried setting GIT_WORK_TREE to my temp dir, without success. Is the documentation wrong about 'working directory'? Did it mean to say 'working tree'? Looking at the source for archive.c, it seems to assume a GIT_WORK_TREE.

Would you accept a patch that either adds an option to explicitly set the .gitattributes file or would let --worktree-attributes look in $PWD.

Thanks, Amit

Junio C Hamano· Apr 9, 2013, 21:12 UTC · re: Amit Bakshi · lore

Re: git-archive --worktree-attributes (1.8.2)

Amit Bakshi <ambakshi@gmail.com> writes:
Show 7 quoted lines
> Hi,
>
>  In the help for git-archive it states:
>
>        --worktree-attributes
>            Look for attributes in .gitattributes in working directory too.
> ...

The worktree-attributes should read from the worktree. It should not pay any attention to where you are in the directory hierarchy, i.e. your current working directory (aka $cwd).

> Would you accept a patch that either adds an option to explicitly set
> the .gitattributes file or would let --worktree-attributes look in
> $PWD.

The former, possibly, if accompanied with a good justification and implemented cleanly.

The latter, definitely not.
René Scharfe· Apr 10, 2013, 17:49 UTC · re: Junio C Hamano · lore

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

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?
 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.
-- 
1.8.2.1
Eric Sunshine· Apr 10, 2013, 18:40 UTC · re: René Scharfe · lore

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

On Wed, Apr 10, 2013 at 1:49 PM, René Scharfe <rene.scharfe@lsrfire.ath.cx> wrote:

> 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
s/PDW/PWD/
> more details.
>
> Reported-by: Amit Bakshi <ambakshi@gmail.com>
> Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Junio C Hamano· Apr 10, 2013, 18:56 UTC · re: René Scharfe · lore

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

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.

← back to recent threads