summaryrefslogtreecommitdiffstats
path: root/technical/racy-git.html
diff options
context:
space:
mode:
Diffstat (limited to 'technical/racy-git.html')
-rw-r--r--technical/racy-git.html14
1 files changed, 7 insertions, 7 deletions
diff --git a/technical/racy-git.html b/technical/racy-git.html
index d2a7193b9..50b13cfaa 100644
--- a/technical/racy-git.html
+++ b/technical/racy-git.html
@@ -735,7 +735,7 @@ asciidoc.install();
<body class="article">
<div id="header">
<h1>Use of index and Racy Git problem</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div class="sect1">
@@ -747,7 +747,7 @@ paths and their object names and serves as a staging area to
write out the next tree object to be committed. The state is
"virtual" in the sense that it does not necessarily have to, and
often does not, match the files in the working tree.</p></div>
-<div class="paragraph"><p>There are cases Git needs to examine the differences between the
+<div class="paragraph"><p>There are cases where Git needs to examine the differences between the
virtual working tree state in the index and the files in the
working tree. The most obvious case is when the user asks <code>git
diff</code> (or its low level implementation, <code>git diff-files</code>) or
@@ -908,9 +908,9 @@ of the cached stat information.</p></div>
<div class="sectionbody">
<div class="paragraph"><p>In order to avoid the above runtime penalty, post 1.4.2 Git used
to have a code that made sure the index file
-got timestamp newer than the youngest files in the index when
-there are many young files with the same timestamp as the
-resulting index file would otherwise would have by waiting
+got a timestamp newer than the youngest files in the index when
+there were many young files with the same timestamp as the
+resulting index file otherwise would have by waiting
before finishing writing the index file out.</p></div>
<div class="paragraph"><p>I suspected that in practice the situation where many paths in the
index are all racily clean was quite rare. The only code paths
@@ -938,7 +938,7 @@ out can become racily clean.</p></div>
however, the initial computation of all object names in the
index takes more than one second, and the index file is written
out after all that happens. Therefore the timestamp of the
-index file will be more than one seconds later than the
+index file will be more than one second later than the
youngest file in the working tree. This means that in these
cases there actually will not be any racily clean entry in
the resulting index.</p></div>
@@ -953,7 +953,7 @@ practice anymore. This was done with commit 0fc82cff on Aug 15,
<div id="footer">
<div id="footer-text">
Last updated
- 2020-03-10 15:02:33 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>