{"thread":{"id":"17984","subject":"[PATCH] git-gui: Fix file name pattern in .gitattributes.","startedAt":"2009-02-24T08:01:33Z","lastAt":"2009-02-25T08:00:55Z","messageCount":6,"participants":["Johannes Sixt","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"105999","messageId":"1235462493-8761-1-git-send-email-j6t@kdbg.org","threadId":"17984","inReplyTo":null,"subject":"[PATCH] git-gui: Fix file name pattern in .gitattributes.","fromName":"Johannes Sixt","fromEmail":"j6t@kdbg.org","sentAt":"2009-02-24T08:01:33Z","receivedAt":"2009-02-24T08:01:33Z","isPatch":true,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"The pattern for the *.po files was anchored at the repository's root, but\nthis would match the files only in the git-gui repository itself, but\nnot in the version that is subtree-merged into git.git.\n\nSigned-off-by: Johannes Sixt \n---\n .gitattributes | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/.gitattributes b/.gitattributes\nindex f96112d..c69f4a0 100644\n--- a/.gitattributes\n+++ b/.gitattributes\n@@ -1,3 +1,3 @@\n * encoding=US-ASCII\n git-gui.sh encoding=UTF-8\n-/po/*.po encoding=UTF-8\n+po/*.po encoding=UTF-8\n-- \n1.6.2.rc0.81.g1e300\n"},{"id":"106001","messageId":"7vskm4jkbk.fsf@gitster.siamese.dyndns.org","threadId":"17984","inReplyTo":"1235462493-8761-1-git-send-email-j6t@kdbg.org","subject":"Re: [PATCH] git-gui: Fix file name pattern in .gitattributes.","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-02-24T08:44:15Z","receivedAt":"2009-02-24T08:44:15Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Sixt writes:\n\n> The pattern for the *.po files was anchored at the repository's root, but\n> this would match the files only in the git-gui repository itself, but\n> not in the version that is subtree-merged into git.git.\n>\n> Signed-off-by: Johannes Sixt \n> ---\n> .gitattributes | 2 +-\n> 1 files changed, 1 insertions(+), 1 deletions(-)\n>\n> diff --git a/.gitattributes b/.gitattributes\n> index f96112d..c69f4a0 100644\n> --- a/.gitattributes\n> +++ b/.gitattributes\n> @@ -1,3 +1,3 @@\n> * encoding=US-ASCII\n> git-gui.sh encoding=UTF-8\n> -/po/*.po encoding=UTF-8\n> +po/*.po encoding=UTF-8\n\nHmm, really?\n\n $ pwd\n /pub/git/git.git\n $ git check-attr encoding git-gui/po/xx.po\n git-gui/xx/ja.po: encoding: UTF-8\n $ git check-attr encoding git-gui/funk/po/xx.po\n git-gui/funk/po/xx.po: encoding: US-ASCII\n"},{"id":"106013","messageId":"49A3BD25.3000706@viscovery.net","threadId":"17984","inReplyTo":"7vskm4jkbk.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] git-gui: Fix file name pattern in .gitattributes.","fromName":"Johannes Sixt","fromEmail":"j.sixt@viscovery.net","sentAt":"2009-02-24T09:25:57Z","receivedAt":"2009-02-24T09:25:57Z","isPatch":true,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Junio C Hamano schrieb:\n> Johannes Sixt writes:\n> \n>> The pattern for the *.po files was anchored at the repository's root, but\n>> this would match the files only in the git-gui repository itself, but\n>> not in the version that is subtree-merged into git.git.\n>>\n>> Signed-off-by: Johannes Sixt \n>> ---\n>> .gitattributes | 2 +-\n>> 1 files changed, 1 insertions(+), 1 deletions(-)\n>>\n>> diff --git a/.gitattributes b/.gitattributes\n>> index f96112d..c69f4a0 100644\n>> --- a/.gitattributes\n>> +++ b/.gitattributes\n>> @@ -1,3 +1,3 @@\n>> * encoding=US-ASCII\n>> git-gui.sh encoding=UTF-8\n>> -/po/*.po encoding=UTF-8\n>> +po/*.po encoding=UTF-8\n> \n> Hmm, really?\n\nNo, not really. =:{\n\nI observed some strangeness with gitk. But it turned out that this was an\nold development version that got accidentally installed somewhere in $PATH.\n\nSorry for the noise.\n\n-- Hannes\n"},{"id":"106082","messageId":"7vskm3hh8n.fsf@gitster.siamese.dyndns.org","threadId":"17984","inReplyTo":"49A3BD25.3000706@viscovery.net","subject":"Re: [PATCH] git-gui: Fix file name pattern in .gitattributes.","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-02-24T17:33:44Z","receivedAt":"2009-02-24T17:33:44Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Sixt writes:\n\n> Junio C Hamano schrieb:\n>> Johannes Sixt writes:\n>> \n>>> The pattern for the *.po files was anchored at the repository's root, but\n>>> this would match the files only in the git-gui repository itself, but\n>>> not in the version that is subtree-merged into git.git.\n>>>\n>>> Signed-off-by: Johannes Sixt \n>>> ---\n>>> .gitattributes | 2 +-\n>>> 1 files changed, 1 insertions(+), 1 deletions(-)\n>>>\n>>> diff --git a/.gitattributes b/.gitattributes\n>>> index f96112d..c69f4a0 100644\n>>> --- a/.gitattributes\n>>> +++ b/.gitattributes\n>>> @@ -1,3 +1,3 @@\n>>> * encoding=US-ASCII\n>>> git-gui.sh encoding=UTF-8\n>>> -/po/*.po encoding=UTF-8\n>>> +po/*.po encoding=UTF-8\n>> \n>> Hmm, really?\n>\n> No, not really. =:{\n>\n> I observed some strangeness with gitk. But it turned out that this was an\n> old development version that got accidentally installed somewhere in $PATH.\n>\n> Sorry for the noise.\n\nActually, while I was responding to your message, I looked at\ngitattributes documentation and noticed that it does not say anything\nabout how the \"glob\" is used to match paths. The rules applied should be\nthe same as those from gitignore (except obviously we do not have negated\npattern that gitignore has, because it does not mean \"path not matching\nthis pattern\" over there), and it should be documented.\n"},{"id":"106147","messageId":"49A4F942.1090907@viscovery.net","threadId":"17984","inReplyTo":"7vskm3hh8n.fsf@gitster.siamese.dyndns.org","subject":"[PATCH 1/2] gitattributes.txt: Path matching rules are explained in gitignore.txt","fromName":"Johannes Sixt","fromEmail":"j.sixt@viscovery.net","sentAt":"2009-02-25T07:54:42Z","receivedAt":"2009-02-25T07:54:42Z","isPatch":true,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"From: Johannes Sixt \n\nThe rules how the patterns are matched against path names are the same\nfor .gitattribute and .gitignore files.\n\nThis also replace the notion \"glob pattern\" by \"pattern\" because\ngitignore.txt talks about \"glob\" only in some contexts where the pattern\nis mentioned.\n\nSigned-off-by: Johannes Sixt \n---\n Junio C Hamano schrieb:\n > Actually, while I was responding to your message, I looked at\n > gitattributes documentation and noticed that it does not say anything\n > about how the \"glob\" is used to match paths.\n\n Here's a patch.\n\n -- Hannes\n\n Documentation/gitattributes.txt | 13 +++++++------\n 1 files changed, 7 insertions(+), 6 deletions(-)\n\ndiff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt\nindex 227934f..55668e3 100644\n--- a/Documentation/gitattributes.txt\n+++ b/Documentation/gitattributes.txt\n@@ -18,10 +18,10 @@ A `gitattributes` file is a simple text\n\n Each line in `gitattributes` file is of form:\n\n-\tglob\tattr1 attr2 ...\n+\tpattern\tattr1 attr2 ...\n\n-That is, a glob pattern followed by an attributes list,\n-separated by whitespaces. When the glob pattern matches the\n+That is, a pattern followed by an attributes list,\n+separated by whitespaces. When the pattern matches the\n path in question, the attributes listed on the line are given to\n the path.\n\n@@ -48,13 +48,14 @@ Set to a value::\n\n Unspecified::\n\n-\tNo glob pattern matches the path, and nothing says if\n+\tNo pattern matches the path, and nothing says if\n \tthe path has or does not have the attribute, the\n \tattribute for the path is said to be Unspecified.\n\n-When more than one glob pattern matches the path, a later line\n+When more than one pattern matches the path, a later line\n overrides an earlier line. This overriding is done per\n-attribute.\n+attribute. The rules how the pattern matches paths are the\n+same as in `.gitignore` files; see linkgit:gitignore[5].\n\n When deciding what attributes are assigned to a path, git\n consults `$GIT_DIR/info/attributes` file (which has the highest\n-- \n1.6.2.rc0.81.g1e300\n"},{"id":"106148","messageId":"49A4FAB7.5050607@viscovery.net","threadId":"17984","inReplyTo":"49A4F942.1090907@viscovery.net","subject":"Re: [PATCH 1/2] gitattributes.txt: Path matching rules are explained in gitignore.txt","fromName":"Johannes Sixt","fromEmail":"j.sixt@viscovery.net","sentAt":"2009-02-25T08:00:55Z","receivedAt":"2009-02-25T08:00:55Z","isPatch":true,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"There is no [PATCH 2/2]. Sorry for that :-(\n\n-- Hannes\n"}]}