* [PATCH v2] doc: core.ignoreStat update, and clarify the --assume-unchanged effect
@ 2015-01-02 0:18 Philip Oakley
2015-01-04 20:02 ` Junio C Hamano
0 siblings, 1 reply; 3+ messages in thread
From: Philip Oakley @ 2015-01-02 0:18 UTC (permalink / raw)
To: Junio C Hamano; +Cc: GitList, Johannes Schindelin
The assume-unchanged bit, and consequently core.ignoreStat, can be
misunderstood. Be assertive about the expectation that file changes should
notified to Git.
Signed-off-by: Philip Oakley <philipoakley@iee.org>
---
Overhaul the general wording thus:
1. direct description of what is ignored given first.
2. example instruction of the user manual action required.
3. use sideways indirection for assume-unchanged and update-index references.
4. add a 'normally' to give leeway for the change detection.
This version is on top of the current master, and replaces the patch in next.
---
Documentation/config.txt | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 6862e3e..32e42dd 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -375,13 +375,17 @@ This is useful for excluding servers inside a firewall from
proxy use, while defaulting to a common proxy for external domains.
core.ignoreStat::
- If true, commands which modify both the working tree and the index
- will mark the updated paths with the "assume unchanged" bit in the
- index. These marked files are then assumed to stay unchanged in the
- working tree, until you mark them otherwise manually - Git will not
- detect the file changes by lstat() calls. This is useful on systems
- where those are very slow, such as Microsoft Windows.
- See linkgit:git-update-index[1].
+ If true, Git will avoid using lstat() calls to detect if files have
+ changed. Git will set the "assume-unchanged" bit for those tracked files
+ which it has updated identically in both the index and working tree.
++
+ When files are modified outside of Git, the user will need to stage
+ the modified files explicitly (e.g. see 'Examples' section in
+ linkgit:git-update-index[1]).
+ Git will not normally detect changes to those files.
++
+ This is useful on systems where lstat() calls are very slow, such as
+ CIFS/Microsoft Windows.
False by default.
core.preferSymlinkRefs::
--
1.9.5.msysgit.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] doc: core.ignoreStat update, and clarify the --assume-unchanged effect
2015-01-02 0:18 [PATCH v2] doc: core.ignoreStat update, and clarify the --assume-unchanged effect Philip Oakley
@ 2015-01-04 20:02 ` Junio C Hamano
2015-01-05 16:04 ` Philip Oakley
0 siblings, 1 reply; 3+ messages in thread
From: Junio C Hamano @ 2015-01-04 20:02 UTC (permalink / raw)
To: Philip Oakley; +Cc: GitList, Johannes Schindelin
Philip Oakley <philipoakley@iee.org> writes:
> The assume-unchanged bit, and consequently core.ignoreStat, can be
> misunderstood. Be assertive about the expectation that file changes should
> notified to Git.
>
> Signed-off-by: Philip Oakley <philipoakley@iee.org>
> ---
> Overhaul the general wording thus:
> 1. direct description of what is ignored given first.
> 2. example instruction of the user manual action required.
> 3. use sideways indirection for assume-unchanged and update-index references.
> 4. add a 'normally' to give leeway for the change detection.
>
> This version is on top of the current master, and replaces the patch in next.
Sorry, you do not replace anything in 'next', once it is in.
I was about to say that I'll try to see if I turn it into
incremental (at which point some of the above four points after the
three-dash line might want to be in the log message proper), but the
AsciiDoc mark-up looks somewhat suspect (we usually do not see
indentation in the paragraphs continued with "+"). Does this format
fine for manpage and HTML?
Thanks.
> ---
> Documentation/config.txt | 18 +++++++++++-------
> 1 file changed, 11 insertions(+), 7 deletions(-)
>
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index 6862e3e..32e42dd 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -375,13 +375,17 @@ This is useful for excluding servers inside a firewall from
> proxy use, while defaulting to a common proxy for external domains.
>
> core.ignoreStat::
> - If true, commands which modify both the working tree and the index
> - will mark the updated paths with the "assume unchanged" bit in the
> - index. These marked files are then assumed to stay unchanged in the
> - working tree, until you mark them otherwise manually - Git will not
> - detect the file changes by lstat() calls. This is useful on systems
> - where those are very slow, such as Microsoft Windows.
> - See linkgit:git-update-index[1].
> + If true, Git will avoid using lstat() calls to detect if files have
> + changed. Git will set the "assume-unchanged" bit for those tracked files
> + which it has updated identically in both the index and working tree.
> ++
> + When files are modified outside of Git, the user will need to stage
> + the modified files explicitly (e.g. see 'Examples' section in
> + linkgit:git-update-index[1]).
> + Git will not normally detect changes to those files.
> ++
> + This is useful on systems where lstat() calls are very slow, such as
> + CIFS/Microsoft Windows.
> False by default.
>
> core.preferSymlinkRefs::
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] doc: core.ignoreStat update, and clarify the --assume-unchanged effect
2015-01-04 20:02 ` Junio C Hamano
@ 2015-01-05 16:04 ` Philip Oakley
0 siblings, 0 replies; 3+ messages in thread
From: Philip Oakley @ 2015-01-05 16:04 UTC (permalink / raw)
To: Junio C Hamano; +Cc: GitList, Johannes Schindelin
From: "Junio C Hamano" <gitster@pobox.com>
> Philip Oakley <philipoakley@iee.org> writes:
>
>> The assume-unchanged bit, and consequently core.ignoreStat, can be
>> misunderstood. Be assertive about the expectation that file changes
>> should
>> notified to Git.
>>
>> Signed-off-by: Philip Oakley <philipoakley@iee.org>
>> ---
>> Overhaul the general wording thus:
>> 1. direct description of what is ignored given first.
>> 2. example instruction of the user manual action required.
>> 3. use sideways indirection for assume-unchanged and update-index
>> references.
>> 4. add a 'normally' to give leeway for the change detection.
>>
>> This version is on top of the current master, and replaces the patch
>> in next.
>
> Sorry, you do not replace anything in 'next', once it is in.
My apologies. I'd been too quick to read the 'expecting reroll' to
properly notice the promotion to next.
>
> I was about to say that I'll try to see if I turn it into
> incremental (at which point some of the above four points after the
> three-dash line might want to be in the log message proper), but the
> AsciiDoc mark-up looks somewhat suspect (we usually do not see
> indentation in the paragraphs continued with "+"). Does this format
> fine for manpage and HTML?
I didn't have access to AsciiDoc at the time.
You are right, it doesn't format correctly, I shouldn't have continued
with the indentation tabs in the continuation paragraphs. My mistake. I
can re-roll if that's easiest
>
> Thanks.
>
>> ---
>> Documentation/config.txt | 18 +++++++++++-------
>> 1 file changed, 11 insertions(+), 7 deletions(-)
>>
>> diff --git a/Documentation/config.txt b/Documentation/config.txt
>> index 6862e3e..32e42dd 100644
>> --- a/Documentation/config.txt
>> +++ b/Documentation/config.txt
>> @@ -375,13 +375,17 @@ This is useful for excluding servers inside a
>> firewall from
>> proxy use, while defaulting to a common proxy for external domains.
>>
>> core.ignoreStat::
>> - If true, commands which modify both the working tree and the index
>> - will mark the updated paths with the "assume unchanged" bit in the
>> - index. These marked files are then assumed to stay unchanged in the
>> - working tree, until you mark them otherwise manually - Git will not
>> - detect the file changes by lstat() calls. This is useful on systems
>> - where those are very slow, such as Microsoft Windows.
>> - See linkgit:git-update-index[1].
>> + If true, Git will avoid using lstat() calls to detect if files have
>> + changed. Git will set the "assume-unchanged" bit for those tracked
>> files
>> + which it has updated identically in both the index and working
>> tree.
>> ++
>> + When files are modified outside of Git, the user will need to stage
>> + the modified files explicitly (e.g. see 'Examples' section in
>> + linkgit:git-update-index[1]).
>> + Git will not normally detect changes to those files.
>> ++
>> + This is useful on systems where lstat() calls are very slow, such
>> as
>> + CIFS/Microsoft Windows.
>> False by default.
>>
>> core.preferSymlinkRefs::
> --
Philip
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-01-05 16:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-02 0:18 [PATCH v2] doc: core.ignoreStat update, and clarify the --assume-unchanged effect Philip Oakley
2015-01-04 20:02 ` Junio C Hamano
2015-01-05 16:04 ` Philip Oakley
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.