* [PATCH] Doc: mention the crlf attribute in config autocrlf section
@ 2009-11-14 18:35 Matthew Ogilvie
2009-11-16 10:50 ` Nanako Shiraishi
0 siblings, 1 reply; 5+ messages in thread
From: Matthew Ogilvie @ 2009-11-14 18:35 UTC (permalink / raw)
To: git, gitster; +Cc: Matthew Ogilvie
The reverse reference has long existed, and the autocrlf description
was actually obsolete and wrong (saying only file content is used),
not just incomplete.
Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net>
---
Documentation/config.txt | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index d1e2120..0dc6b12 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -169,9 +169,10 @@ core.autocrlf::
writing to the filesystem. The variable can be set to
'input', in which case the conversion happens only while
reading from the filesystem but files are written out with
- `LF` at the end of lines. Currently, which paths to consider
- "text" (i.e. be subjected to the autocrlf mechanism) is
- decided purely based on the contents.
+ `LF` at the end of lines. A file is considered
+ "text" (i.e. be subjected to the autocrlf mechanism) based on
+ the file's `crlf` attribute, or if `crlf` is unspecified,
+ based on the file's contents. See linkgit:gitattributes[5].
core.safecrlf::
If true, makes git check if converting `CRLF` as controlled by
--
1.6.4.GIT
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] Doc: mention the crlf attribute in config autocrlf section
2009-11-14 18:35 [PATCH] Doc: mention the crlf attribute in config autocrlf section Matthew Ogilvie
@ 2009-11-16 10:50 ` Nanako Shiraishi
2009-11-17 3:59 ` Matthew Ogilvie
0 siblings, 1 reply; 5+ messages in thread
From: Nanako Shiraishi @ 2009-11-16 10:50 UTC (permalink / raw)
To: Matthew Ogilvie; +Cc: git, gitster
Quoting Matthew Ogilvie <mmogilvi_git@miniinfo.net>
> The reverse reference has long existed, and the autocrlf description
> was actually obsolete and wrong (saying only file content is used),
> not just incomplete.
What do you mean by "reverse reference"?
> Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net>
> ---
> Documentation/config.txt | 7 ++++---
> 1 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index d1e2120..0dc6b12 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -169,9 +169,10 @@ core.autocrlf::
> writing to the filesystem. The variable can be set to
> 'input', in which case the conversion happens only while
> reading from the filesystem but files are written out with
> - `LF` at the end of lines. Currently, which paths to consider
> - "text" (i.e. be subjected to the autocrlf mechanism) is
> - decided purely based on the contents.
> + `LF` at the end of lines. A file is considered
> + "text" (i.e. be subjected to the autocrlf mechanism) based on
> + the file's `crlf` attribute, or if `crlf` is unspecified,
> + based on the file's contents. See linkgit:gitattributes[5].
>
> core.safecrlf::
> If true, makes git check if converting `CRLF` as controlled by
The updated text looks correct to me.
--
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Doc: mention the crlf attribute in config autocrlf section
2009-11-16 10:50 ` Nanako Shiraishi
@ 2009-11-17 3:59 ` Matthew Ogilvie
2009-11-17 6:37 ` Junio C Hamano
0 siblings, 1 reply; 5+ messages in thread
From: Matthew Ogilvie @ 2009-11-17 3:59 UTC (permalink / raw)
To: Nanako Shiraishi; +Cc: git, gitster
On Mon, Nov 16, 2009 at 07:50:48PM +0900, Nanako Shiraishi wrote:
> Quoting Matthew Ogilvie <mmogilvi_git@miniinfo.net>
>
> > The reverse reference has long existed, and the autocrlf description
> > was actually obsolete and wrong (saying only file content is used),
> > not just incomplete.
>
> What do you mean by "reverse reference"?
>
I'm refering to the fact that the "crlf" section of
Documentation/gitattributes.txt mentions core.autocrlf,
which is in the opposite (reverse) direction as this new reference
I'm adding.
The crlf section has a much more thorough description of
the various knobs and settings and how they interact. But
I just checked, and although the gitattributes crlf section
describes core.autocrlf in reasonable detail, it does not have an
actual link (reference?) to git-config or the core.autocrlf
section. So the commit message isn't as clear as it could be.
Do I need to resubmit the patch, in order to rephrase the commit
message?
--
Matthew Ogilvie [mmogilvi_git@miniinfo.net]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Doc: mention the crlf attribute in config autocrlf section
2009-11-17 3:59 ` Matthew Ogilvie
@ 2009-11-17 6:37 ` Junio C Hamano
2009-11-17 7:43 ` Matthew Ogilvie
0 siblings, 1 reply; 5+ messages in thread
From: Junio C Hamano @ 2009-11-17 6:37 UTC (permalink / raw)
To: Matthew Ogilvie; +Cc: Nanako Shiraishi, git, gitster
Matthew Ogilvie <mmogilvi_git@miniinfo.net> writes:
> On Mon, Nov 16, 2009 at 07:50:48PM +0900, Nanako Shiraishi wrote:
>> Quoting Matthew Ogilvie <mmogilvi_git@miniinfo.net>
>>
>> > The reverse reference has long existed, and the autocrlf description
>> > was actually obsolete and wrong (saying only file content is used),
>> > not just incomplete.
>>
>> What do you mean by "reverse reference"?
>
> I'm refering to the fact that the "crlf" section of
> Documentation/gitattributes.txt mentions core.autocrlf,
> which is in the opposite (reverse) direction as this new reference
> I'm adding.
> ...
> Do I need to resubmit the patch, in order to rephrase the commit
> message?
Thanks; I heard you, as your response was Cc'ed to me as well ;-)
How about this? I didn't touch the patch text (other than dropping
trailing whitespaces).
commit ff68668695486b72b5f06146eddf85b70841088a
Author: Matthew Ogilvie <mmogilvi_git@miniinfo.net>
Date: Sat Nov 14 11:35:00 2009 -0700
core.autocrlf documentation: mention the crlf attribute
The description of the configuration variable is obsolete and
wrong (saying only file content is used), not just incomplete.
It has used the attribute mechanism for a long time.
The documentation of gitattributes mentions the core.autocrlf
configuration variable in its description of crlf attribute.
Refer to the gitattributes documentation from here as well.
Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Doc: mention the crlf attribute in config autocrlf section
2009-11-17 6:37 ` Junio C Hamano
@ 2009-11-17 7:43 ` Matthew Ogilvie
0 siblings, 0 replies; 5+ messages in thread
From: Matthew Ogilvie @ 2009-11-17 7:43 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Nanako Shiraishi, git
On Mon, Nov 16, 2009 at 10:37:09PM -0800, Junio C Hamano wrote:
> How about this? I didn't touch the patch text (other than dropping
> trailing whitespaces).
>
> commit ff68668695486b72b5f06146eddf85b70841088a
> Author: Matthew Ogilvie <mmogilvi_git@miniinfo.net>
> Date: Sat Nov 14 11:35:00 2009 -0700
>
> core.autocrlf documentation: mention the crlf attribute
>
> The description of the configuration variable is obsolete and
> wrong (saying only file content is used), not just incomplete.
> It has used the attribute mechanism for a long time.
>
> The documentation of gitattributes mentions the core.autocrlf
> configuration variable in its description of crlf attribute.
> Refer to the gitattributes documentation from here as well.
>
> Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Looks good. Sorry about the extra space in the patch text;
stripping it sounds good as well.
--
Matthew Ogilvie [mmogilvi_git@miniinfo.net]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2009-11-17 7:43 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-11-14 18:35 [PATCH] Doc: mention the crlf attribute in config autocrlf section Matthew Ogilvie
2009-11-16 10:50 ` Nanako Shiraishi
2009-11-17 3:59 ` Matthew Ogilvie
2009-11-17 6:37 ` Junio C Hamano
2009-11-17 7:43 ` Matthew Ogilvie
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.