* [PATCH] doc: improve grammar in git-update-index
@ 2018-12-14 21:25 Anthony Sottile
2018-12-15 17:06 ` Philip Oakley
0 siblings, 1 reply; 4+ messages in thread
From: Anthony Sottile @ 2018-12-14 21:25 UTC (permalink / raw)
To: git; +Cc: Anthony Sottile
Signed-off-by: Anthony Sottile <asottile@umich.edu>
---
Documentation/git-update-index.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
index 1c4d146a4..9c03ca167 100644
--- a/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@ -326,7 +326,7 @@ inefficient `lstat(2)`. If your filesystem is one of them, you
can set "assume unchanged" bit to paths you have not changed to
cause Git not to do this check. Note that setting this bit on a
path does not mean Git will check the contents of the file to
-see if it has changed -- it makes Git to omit any checking and
+see if it has changed -- it means Git will skip any checking and
assume it has *not* changed. When you make changes to working
tree files, you have to explicitly tell Git about it by dropping
"assume unchanged" bit, either before or after you modify them.
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] doc: improve grammar in git-update-index
2018-12-14 21:25 [PATCH] doc: improve grammar in git-update-index Anthony Sottile
@ 2018-12-15 17:06 ` Philip Oakley
2018-12-16 0:21 ` Anthony Sottile
2018-12-26 18:12 ` Junio C Hamano
0 siblings, 2 replies; 4+ messages in thread
From: Philip Oakley @ 2018-12-15 17:06 UTC (permalink / raw)
To: Anthony Sottile, git, Philip Oakley
On 14/12/2018 21:25, Anthony Sottile wrote:
> Signed-off-by: Anthony Sottile <asottile@umich.edu>
> ---
> Documentation/git-update-index.txt | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
> index 1c4d146a4..9c03ca167 100644
> --- a/Documentation/git-update-index.txt
> +++ b/Documentation/git-update-index.txt
> @@ -326,7 +326,7 @@ inefficient `lstat(2)`. If your filesystem is one of them, you
> can set "assume unchanged" bit to paths you have not changed to
> cause Git not to do this check. Note that setting this bit on a
> path does not mean Git will check the contents of the file to
> -see if it has changed -- it makes Git to omit any checking and
> +see if it has changed -- it means Git will skip any checking and
> assume it has *not* changed. When you make changes to working
> tree files, you have to explicitly tell Git about it by dropping
> "assume unchanged" bit, either before or after you modify them.
Doesn't this also need the caveat that it is _a promise by the user_
that they will not change the file, such that Git doesn't need to keep
checking, and that occasionally Git will check, or may perform
unexpected actions if the user has the wrong mental model.
--
Philip
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] doc: improve grammar in git-update-index
2018-12-15 17:06 ` Philip Oakley
@ 2018-12-16 0:21 ` Anthony Sottile
2018-12-26 18:12 ` Junio C Hamano
1 sibling, 0 replies; 4+ messages in thread
From: Anthony Sottile @ 2018-12-16 0:21 UTC (permalink / raw)
To: philipoakley; +Cc: Git Mailing List
On Sat, Dec 15, 2018 at 9:18 AM Philip Oakley <philipoakley@iee.org> wrote:
>
> On 14/12/2018 21:25, Anthony Sottile wrote:
> > Signed-off-by: Anthony Sottile <asottile@umich.edu>
> > ---
> > Documentation/git-update-index.txt | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
> > index 1c4d146a4..9c03ca167 100644
> > --- a/Documentation/git-update-index.txt
> > +++ b/Documentation/git-update-index.txt
> > @@ -326,7 +326,7 @@ inefficient `lstat(2)`. If your filesystem is one of them, you
> > can set "assume unchanged" bit to paths you have not changed to
> > cause Git not to do this check. Note that setting this bit on a
> > path does not mean Git will check the contents of the file to
> > -see if it has changed -- it makes Git to omit any checking and
> > +see if it has changed -- it means Git will skip any checking and
> > assume it has *not* changed. When you make changes to working
> > tree files, you have to explicitly tell Git about it by dropping
> > "assume unchanged" bit, either before or after you modify them.
>
> Doesn't this also need the caveat that it is _a promise by the user_
> that they will not change the file, such that Git doesn't need to keep
> checking, and that occasionally Git will check, or may perform
> unexpected actions if the user has the wrong mental model.
>
> --
>
> Philip
>
>
yep, the rest of the documentation in this file explains that in
detail -- I'm just fixing up a sentence that doesn't read well :)
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] doc: improve grammar in git-update-index
2018-12-15 17:06 ` Philip Oakley
2018-12-16 0:21 ` Anthony Sottile
@ 2018-12-26 18:12 ` Junio C Hamano
1 sibling, 0 replies; 4+ messages in thread
From: Junio C Hamano @ 2018-12-26 18:12 UTC (permalink / raw)
To: Philip Oakley; +Cc: Anthony Sottile, git
Philip Oakley <philipoakley@iee.org> writes:
> On 14/12/2018 21:25, Anthony Sottile wrote:
>> Signed-off-by: Anthony Sottile <asottile@umich.edu>
>> ---
>> Documentation/git-update-index.txt | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
>> index 1c4d146a4..9c03ca167 100644
>> --- a/Documentation/git-update-index.txt
>> +++ b/Documentation/git-update-index.txt
>> @@ -326,7 +326,7 @@ inefficient `lstat(2)`. If your filesystem is one of them, you
>> can set "assume unchanged" bit to paths you have not changed to
>> cause Git not to do this check. Note that setting this bit on a
>> path does not mean Git will check the contents of the file to
>> -see if it has changed -- it makes Git to omit any checking and
>> +see if it has changed -- it means Git will skip any checking and
>> assume it has *not* changed. When you make changes to working
>> tree files, you have to explicitly tell Git about it by dropping
>> "assume unchanged" bit, either before or after you modify them.
>
> Doesn't this also need the caveat that it is _a promise by the user_
> that they will not change the file, such that Git doesn't need to keep
> checking, and that occasionally Git will check, or may perform
> unexpected actions if the user has the wrong mental model.
True.
Setting bit _allows_, not necessarily "makes", Git to assume that
the path will not be modified by the user when it is convenient for
Git to make that assumption (e.g. instead of reading a blob out of
the object database, Git may mmap the corresponding working tree
file when they are the same and Git thinks using the latter is more
efficient). When Git finds it more convenient to check if they are
the same, the bit does not stop Git from doing so.
So in that sense, both the text before and after the patch is bad.
Note that setting this bit on a path does not mean Git will
always check, or will never check, the contents of the file
to see if it has changed. The bit allows Git to assume that
the file in the working tree is identical to what is in the
index when it is convenient to do so. When you make
changes...
or something like that.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-12-26 18:12 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-14 21:25 [PATCH] doc: improve grammar in git-update-index Anthony Sottile
2018-12-15 17:06 ` Philip Oakley
2018-12-16 0:21 ` Anthony Sottile
2018-12-26 18:12 ` Junio C Hamano
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).