threads / patch / 17984

patchgit-gui: Fix file name pattern in .gitattributes.

Subject: [PATCH] git-gui: Fix file name pattern in .gitattributes.

## tl;dr

6 messages between Feb 24, 2009 and Feb 25, 2009. Diffs are folded; open one to read it.

replies: 5people: 2as markdown or json

Johannes Sixt· Feb 24, 2009, 08:01 UTC · lore

The pattern for the *.po files was anchored at the repository's root, but this would match the files only in the git-gui repository itself, but not in the version that is subtree-merged into git.git.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
---
 .gitattributes |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Show changes to .gitattributes +1 −1
diff --git a/.gitattributes b/.gitattributes
index f96112d..c69f4a0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,3 @@
 *           encoding=US-ASCII
 git-gui.sh  encoding=UTF-8
-/po/*.po    encoding=UTF-8
+po/*.po     encoding=UTF-8

-- 
1.6.2.rc0.81.g1e300
Junio C Hamano· Feb 24, 2009, 08:44 UTC · re: Johannes Sixt · lore

Re: [PATCH] git-gui: Fix file name pattern in .gitattributes.

Johannes Sixt <j6t@kdbg.org> writes:
Show 18 quoted lines
> The pattern for the *.po files was anchored at the repository's root, but
> this would match the files only in the git-gui repository itself, but
> not in the version that is subtree-merged into git.git.
>
> Signed-off-by: Johannes Sixt <j6t@kdbg.org>
> ---
>  .gitattributes |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/.gitattributes b/.gitattributes
> index f96112d..c69f4a0 100644
> --- a/.gitattributes
> +++ b/.gitattributes
> @@ -1,3 +1,3 @@
>  *           encoding=US-ASCII
>  git-gui.sh  encoding=UTF-8
> -/po/*.po    encoding=UTF-8
> +po/*.po     encoding=UTF-8
Hmm, really?
    $ pwd
    /pub/git/git.git
    $ git check-attr encoding git-gui/po/xx.po
    git-gui/xx/ja.po: encoding: UTF-8
    $ git check-attr encoding git-gui/funk/po/xx.po
    git-gui/funk/po/xx.po: encoding: US-ASCII
Johannes Sixt· Feb 24, 2009, 09:25 UTC · re: Junio C Hamano · lore

Re: [PATCH] git-gui: Fix file name pattern in .gitattributes.

Junio C Hamano schrieb:
Show 22 quoted lines
> Johannes Sixt <j6t@kdbg.org> writes:
> 
>> The pattern for the *.po files was anchored at the repository's root, but
>> this would match the files only in the git-gui repository itself, but
>> not in the version that is subtree-merged into git.git.
>>
>> Signed-off-by: Johannes Sixt <j6t@kdbg.org>
>> ---
>>  .gitattributes |    2 +-
>>  1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/.gitattributes b/.gitattributes
>> index f96112d..c69f4a0 100644
>> --- a/.gitattributes
>> +++ b/.gitattributes
>> @@ -1,3 +1,3 @@
>>  *           encoding=US-ASCII
>>  git-gui.sh  encoding=UTF-8
>> -/po/*.po    encoding=UTF-8
>> +po/*.po     encoding=UTF-8
> 
> Hmm, really?
No, not really. =:{

I observed some strangeness with gitk. But it turned out that this was an old development version that got accidentally installed somewhere in $PATH.

Sorry for the noise.
-- Hannes
Junio C Hamano· Feb 24, 2009, 17:33 UTC · re: Johannes Sixt · lore

Re: [PATCH] git-gui: Fix file name pattern in .gitattributes.

Johannes Sixt <j.sixt@viscovery.net> writes:
Show 30 quoted lines
> Junio C Hamano schrieb:
>> Johannes Sixt <j6t@kdbg.org> writes:
>> 
>>> The pattern for the *.po files was anchored at the repository's root, but
>>> this would match the files only in the git-gui repository itself, but
>>> not in the version that is subtree-merged into git.git.
>>>
>>> Signed-off-by: Johannes Sixt <j6t@kdbg.org>
>>> ---
>>>  .gitattributes |    2 +-
>>>  1 files changed, 1 insertions(+), 1 deletions(-)
>>>
>>> diff --git a/.gitattributes b/.gitattributes
>>> index f96112d..c69f4a0 100644
>>> --- a/.gitattributes
>>> +++ b/.gitattributes
>>> @@ -1,3 +1,3 @@
>>>  *           encoding=US-ASCII
>>>  git-gui.sh  encoding=UTF-8
>>> -/po/*.po    encoding=UTF-8
>>> +po/*.po     encoding=UTF-8
>> 
>> Hmm, really?
>
> No, not really. =:{
>
> I observed some strangeness with gitk. But it turned out that this was an
> old development version that got accidentally installed somewhere in $PATH.
>
> Sorry for the noise.

Actually, while I was responding to your message, I looked at gitattributes documentation and noticed that it does not say anything about how the "glob" is used to match paths. The rules applied should be the same as those from gitignore (except obviously we do not have negated pattern that gitignore has, because it does not mean "path not matching this pattern" over there), and it should be documented.

Johannes Sixt· Feb 25, 2009, 07:54 UTC · re: Junio C Hamano · lore

[PATCH 1/2] gitattributes.txt: Path matching rules are explained in gitignore.txt

From: Johannes Sixt <j6t@kdbg.org>

The rules how the patterns are matched against path names are the same for .gitattribute and .gitignore files.

This also replace the notion "glob pattern" by "pattern" because gitignore.txt talks about "glob" only in some contexts where the pattern is mentioned.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
---
 Junio C Hamano schrieb:
 > Actually, while I was responding to your message, I looked at
 > gitattributes documentation and noticed that it does not say anything
 > about how the "glob" is used to match paths.
 Here's a patch.
 -- Hannes
 Documentation/gitattributes.txt |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)
Show changes to Documentation/gitattributes.txt +7 −6
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index 227934f..55668e3 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -18,10 +18,10 @@ A `gitattributes` file is a simple text

 Each line in `gitattributes` file is of form:

-	glob	attr1 attr2 ...
+	pattern	attr1 attr2 ...

-That is, a glob pattern followed by an attributes list,
-separated by whitespaces.  When the glob pattern matches the
+That is, a pattern followed by an attributes list,
+separated by whitespaces.  When the pattern matches the
 path in question, the attributes listed on the line are given to
 the path.

@@ -48,13 +48,14 @@ Set to a value::

 Unspecified::

-	No glob pattern matches the path, and nothing says if
+	No pattern matches the path, and nothing says if
 	the path has or does not have the attribute, the
 	attribute for the path is said to be Unspecified.

-When more than one glob pattern matches the path, a later line
+When more than one pattern matches the path, a later line
 overrides an earlier line.  This overriding is done per
-attribute.
+attribute.  The rules how the pattern matches paths are the
+same as in `.gitignore` files; see linkgit:gitignore[5].

 When deciding what attributes are assigned to a path, git
 consults `$GIT_DIR/info/attributes` file (which has the highest

-- 
1.6.2.rc0.81.g1e300

← back to recent threads