{"thread":{"id":"21614","subject":"[PATCH] Doc: mention the crlf attribute in config autocrlf section","startedAt":"2009-11-14T18:35:00Z","lastAt":"2009-11-17T07:43:31Z","messageCount":5,"participants":["Matthew Ogilvie","Nanako Shiraishi","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"127551","messageId":"1258223700-4009-1-git-send-email-mmogilvi_git@miniinfo.net","threadId":"21614","inReplyTo":null,"subject":"[PATCH] Doc: mention the crlf attribute in config autocrlf section","fromName":"Matthew Ogilvie","fromEmail":"mmogilvi_git@miniinfo.net","sentAt":"2009-11-14T18:35:00Z","receivedAt":"2009-11-14T18:35:00Z","isPatch":true,"sender":{"key":"mmogilvi_git@miniinfo.net","avatar":null},"body":"The reverse reference has long existed, and the autocrlf description\nwas actually obsolete and wrong (saying only file content is used),\nnot just incomplete.\n\nSigned-off-by: Matthew Ogilvie \n---\n Documentation/config.txt | 7 ++++---\n 1 files changed, 4 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex d1e2120..0dc6b12 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -169,9 +169,10 @@ core.autocrlf::\n \twriting to the filesystem. The variable can be set to\n \t'input', in which case the conversion happens only while\n \treading from the filesystem but files are written out with\n-\t`LF` at the end of lines. Currently, which paths to consider\n-\t\"text\" (i.e. be subjected to the autocrlf mechanism) is\n-\tdecided purely based on the contents.\n+\t`LF` at the end of lines. A file is considered\n+\t\"text\" (i.e. be subjected to the autocrlf mechanism) based on\n+\tthe file's `crlf` attribute, or if `crlf` is unspecified,\n+\tbased on the file's contents. See linkgit:gitattributes[5]. \n \n core.safecrlf::\n \tIf true, makes git check if converting `CRLF` as controlled by\n-- \n1.6.4.GIT\n"},{"id":"127670","messageId":"20091116195048.6117@nanako3.lavabit.com","threadId":"21614","inReplyTo":"1258223700-4009-1-git-send-email-mmogilvi_git@miniinfo.net","subject":"Re: [PATCH] Doc: mention the crlf attribute in config autocrlf section","fromName":"Nanako Shiraishi","fromEmail":"nanako3@lavabit.com","sentAt":"2009-11-16T10:50:48Z","receivedAt":"2009-11-16T10:50:48Z","isPatch":true,"sender":{"key":"nanako3@lavabit.com","avatar":"https://gravatar.com/avatar/3777b9e201c5883a62b1a6fdf7c53f2d712d1d80989146063ea861e33aad72a8?d=mp&s=160"},"body":"Quoting Matthew Ogilvie \n\n> The reverse reference has long existed, and the autocrlf description\n> was actually obsolete and wrong (saying only file content is used),\n> not just incomplete.\n\nWhat do you mean by \"reverse reference\"?\n\n> Signed-off-by: Matthew Ogilvie \n> ---\n> Documentation/config.txt | 7 ++++---\n> 1 files changed, 4 insertions(+), 3 deletions(-)\n>\n> diff --git a/Documentation/config.txt b/Documentation/config.txt\n> index d1e2120..0dc6b12 100644\n> --- a/Documentation/config.txt\n> +++ b/Documentation/config.txt\n> @@ -169,9 +169,10 @@ core.autocrlf::\n> \twriting to the filesystem. The variable can be set to\n> \t'input', in which case the conversion happens only while\n> \treading from the filesystem but files are written out with\n> -\t`LF` at the end of lines. Currently, which paths to consider\n> -\t\"text\" (i.e. be subjected to the autocrlf mechanism) is\n> -\tdecided purely based on the contents.\n> +\t`LF` at the end of lines. A file is considered\n> +\t\"text\" (i.e. be subjected to the autocrlf mechanism) based on\n> +\tthe file's `crlf` attribute, or if `crlf` is unspecified,\n> +\tbased on the file's contents. See linkgit:gitattributes[5]. \n> \n> core.safecrlf::\n> \tIf true, makes git check if converting `CRLF` as controlled by\n\nThe updated text looks correct to me.\n\n-- \nNanako Shiraishi\nhttp://ivory.ap.teacup.com/nanako3/\n"},{"id":"127728","messageId":"20091117035945.GA1728@comcast.net","threadId":"21614","inReplyTo":"20091116195048.6117@nanako3.lavabit.com","subject":"Re: [PATCH] Doc: mention the crlf attribute in config autocrlf section","fromName":"Matthew Ogilvie","fromEmail":"mmogilvi_git@miniinfo.net","sentAt":"2009-11-17T03:59:45Z","receivedAt":"2009-11-17T03:59:45Z","isPatch":true,"sender":{"key":"mmogilvi_git@miniinfo.net","avatar":null},"body":"On Mon, Nov 16, 2009 at 07:50:48PM +0900, Nanako Shiraishi wrote:\n> Quoting Matthew Ogilvie \n> \n> > The reverse reference has long existed, and the autocrlf description\n> > was actually obsolete and wrong (saying only file content is used),\n> > not just incomplete.\n> \n> What do you mean by \"reverse reference\"?\n> \n\nI'm refering to the fact that the \"crlf\" section of\nDocumentation/gitattributes.txt mentions core.autocrlf,\nwhich is in the opposite (reverse) direction as this new reference\nI'm adding.\n\nThe crlf section has a much more thorough description of\nthe various knobs and settings and how they interact. But\nI just checked, and although the gitattributes crlf section\ndescribes core.autocrlf in reasonable detail, it does not have an\nactual link (reference?) to git-config or the core.autocrlf\nsection. So the commit message isn't as clear as it could be.\n\nDo I need to resubmit the patch, in order to rephrase the commit\nmessage?\n\n--\nMatthew Ogilvie [mmogilvi_git@miniinfo.net]\n"},{"id":"127739","messageId":"7v7htpirmy.fsf@alter.siamese.dyndns.org","threadId":"21614","inReplyTo":"20091117035945.GA1728@comcast.net","subject":"Re: [PATCH] Doc: mention the crlf attribute in config autocrlf section","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-11-17T06:37:09Z","receivedAt":"2009-11-17T06:37:09Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Matthew Ogilvie writes:\n\n> On Mon, Nov 16, 2009 at 07:50:48PM +0900, Nanako Shiraishi wrote:\n>> Quoting Matthew Ogilvie \n>> \n>> > The reverse reference has long existed, and the autocrlf description\n>> > was actually obsolete and wrong (saying only file content is used),\n>> > not just incomplete.\n>> \n>> What do you mean by \"reverse reference\"?\n>\n> I'm refering to the fact that the \"crlf\" section of\n> Documentation/gitattributes.txt mentions core.autocrlf,\n> which is in the opposite (reverse) direction as this new reference\n> I'm adding.\n> ...\n> Do I need to resubmit the patch, in order to rephrase the commit\n> message?\n\nThanks; I heard you, as your response was Cc'ed to me as well ;-)\n\nHow about this? I didn't touch the patch text (other than dropping\ntrailing whitespaces).\n\ncommit ff68668695486b72b5f06146eddf85b70841088a\nAuthor: Matthew Ogilvie \nDate: Sat Nov 14 11:35:00 2009 -0700\n\n core.autocrlf documentation: mention the crlf attribute\n \n The description of the configuration variable is obsolete and\n wrong (saying only file content is used), not just incomplete.\n It has used the attribute mechanism for a long time.\n \n The documentation of gitattributes mentions the core.autocrlf\n configuration variable in its description of crlf attribute.\n Refer to the gitattributes documentation from here as well.\n \n Signed-off-by: Matthew Ogilvie \n Signed-off-by: Junio C Hamano \n"},{"id":"127747","messageId":"20091117074330.GA2813@comcast.net","threadId":"21614","inReplyTo":"7v7htpirmy.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] Doc: mention the crlf attribute in config autocrlf section","fromName":"Matthew Ogilvie","fromEmail":"mmogilvi_git@miniinfo.net","sentAt":"2009-11-17T07:43:31Z","receivedAt":"2009-11-17T07:43:31Z","isPatch":true,"sender":{"key":"mmogilvi_git@miniinfo.net","avatar":null},"body":"On Mon, Nov 16, 2009 at 10:37:09PM -0800, Junio C Hamano wrote:\n> How about this? I didn't touch the patch text (other than dropping\n> trailing whitespaces).\n> \n> commit ff68668695486b72b5f06146eddf85b70841088a\n> Author: Matthew Ogilvie \n> Date: Sat Nov 14 11:35:00 2009 -0700\n> \n> core.autocrlf documentation: mention the crlf attribute\n> \n> The description of the configuration variable is obsolete and\n> wrong (saying only file content is used), not just incomplete.\n> It has used the attribute mechanism for a long time.\n> \n> The documentation of gitattributes mentions the core.autocrlf\n> configuration variable in its description of crlf attribute.\n> Refer to the gitattributes documentation from here as well.\n> \n> Signed-off-by: Matthew Ogilvie \n> Signed-off-by: Junio C Hamano \n\nLooks good. Sorry about the extra space in the patch text;\nstripping it sounds good as well.\n\n--\nMatthew Ogilvie [mmogilvi_git@miniinfo.net]\n"}]}