Skip to content

Commit b3bf16d

Browse files
committed
rn-105: minor copy edit
1 parent cd7a34d commit b3bf16d

File tree

1 file changed

+28
-30
lines changed

1 file changed

+28
-30
lines changed

rev_news/drafts/edition-105.md

Lines changed: 28 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -37,29 +37,29 @@ This edition covers what happened during the months of October 2023 and November
3737

3838
In May 2022 Jason Hatton sent
3939
[an email to the mailing list](https://lore.kernel.org/git/CY4PR16MB1655A1F7DD8B2FABCC30C9DAAFC39@CY4PR16MB1655.namprd16.prod.outlook.com/)
40-
about the fact any file with a size that is an exact multiple of
41-
8GBi makes Git extremely slow on the repository.
40+
about the fact that any file of a size that is an exact multiple
41+
of 8GiB makes Git extremely slow on the repository.
4242

4343
He said that he had already opened
4444
[an issue about this on the Git for Windows issue tracker](https://github.com/git-for-windows/git/issues/3833#issuecomment-1116544918)
45-
where Jason, Philip Oakley, brian m. carlson and Dscho, alias
46-
Johannes Schindelin had already discussed the issue.
45+
where Jason, Philip Oakley, brian m. carlson and Johannes
46+
Schindelin, alias Dscho, had already discussed the issue.
4747

4848
Git uses an `uint32_t` type, a 32 bit long unsigned integer, for
4949
storing the file size in the index. This rolls over if the value is
50-
greater than 2 to the power 32, so with file sizes over 4GB. When
51-
the size is exactly 4GBi or a multiple of it, like 8GBi, the roll
52-
over makes it zero.
50+
greater than 2 to the power 32, so with file sizes over 4GiB. When
51+
the size is exactly 4GiB or a multiple of it, like 8GiB,
52+
the rollover makes it zero.
5353

54-
A zero file size in the index has a special meaning for Git
54+
A zero file size in the index has a special meaning for Git,
5555
though. It tells Git that the file needs to be hashed again. Hashing
56-
a file is supposed to reset its file size in the index to a non zero
57-
value, but with a 4GBi file size the roll over happens and the file
56+
a file is supposed to reset its file size in the index to a non-zero
57+
value, but with a 4GiB file size the rollover happens and the file
5858
size is still zero. So the hashing will be performed again and again
59-
by many different Git commands which will make Git very slow.
59+
by many different Git commands, making Git very slow.
6060

6161
Jason proposed, as a solution to this problem, to detect when the
62-
roll over would happen, and in that case set the size to 1 instead
62+
rollover would happen, and in that case set the size to 1 instead
6363
of zero.
6464

6565
Junio C Hamano, the Git maintainer, replied to Jason confirming the
@@ -70,7 +70,7 @@ This edition covers what happened during the months of October 2023 and November
7070
René Scharfe then chimed into the discussion asking if a value other
7171
than one would be better and would avoid other possible issues.
7272
Philip Oakley replied to René suggesting using 0x80000000 instead of
73-
1 when the roll over is detected. This would make it easier to
73+
1 when the rollover is detected. This would make it easier to
7474
detect "almost all incremental and decremental changes in file
7575
sizes", as the file size in the index helps detecting file changes.
7676

@@ -101,7 +101,7 @@ This edition covers what happened during the months of October 2023 and November
101101
[a new version of Jason's patch](https://lore.kernel.org/git/[email protected]/)
102102
along with another patch adding tests.
103103

104-
These patches were reviewed by Eric Sunshine, Peff, alias Jeff King,
104+
These patches were reviewed by Eric Sunshine, Jeff King, alias Peff,
105105
Junio and Jason. After some discussions it appeared that the patches
106106
were good enough for Junio so that he decided to make a small change
107107
in them and then merge them. This issue is therefore fixed in the
@@ -126,8 +126,8 @@ This edition covers what happened during the months of October 2023 and November
126126
I made and now maintain the Bulgarian translation of the text
127127
interface of Git, Gitk and Git Gui.
128128

129-
* What is the typical workflow of a contributor contributor engaged
130-
in translation for Git?
129+
* What is the typical workflow of a contributor engaged in Git
130+
translation?
131131

132132
There are 19 translations of the text interface of Git and only 13 of
133133
them are above 80% so I am not sure about "typical". It is a fairly
@@ -198,7 +198,7 @@ This edition covers what happened during the months of October 2023 and November
198198
Git to reach 100%. Getting to 100% was immensely hard, rewarding and
199199
memorable. Afterwards keeping the translation at 100% was much easier.
200200

201-
* Is there something you feel that could be done to ease the life of
201+
* Is there something you feel could be done to ease the life of
202202
translators?
203203

204204
The terminology glossary of Git is much larger than 7 years ago and we
@@ -258,12 +258,11 @@ __Light reading__
258258
and
259259
[Git Rev News #104](https://git.github.io/rev_news/2023/10/31/edition-104/)
260260
with [Some miscellaneous git facts](https://jvns.ca/blog/2023/10/20/some-miscellaneous-git-facts/));
261-
currently there are available the following additional posts:
261+
currently there are the following additional posts:
262262
[Confusing git terminology](https://jvns.ca/blog/2023/11/01/confusing-git-terminology/),
263263
[git rebase: what can go wrong?](https://jvns.ca/blog/2023/11/06/rebasing-what-can-go-wrong-/),
264264
[How git cherry-pick and revert use 3-way merge](https://jvns.ca/blog/2023/11/10/how-cherry-pick-and-revert-work/),
265-
and [git branches: intuition & reality](https://jvns.ca/blog/2023/11/23/branches-intuition-reality/)
266-
(so far).
265+
and [git branches: intuition & reality](https://jvns.ca/blog/2023/11/23/branches-intuition-reality/).
267266
+ Julia Evans (@b0rk@jvns.ca) asked about read-only FUSE filesystem for a git repository
268267
where every commit is a folder and the folder contains all the files in that commit
269268
[on Mastodon](https://fosstodon.org/@[email protected]/111462737333140668), so this series may continue
@@ -277,8 +276,7 @@ __Light reading__
277276
about confusing git terminology, the [.. and ... section](https://jvns.ca/blog/2023/11/01/confusing-git-terminology/#and).
278277
+ [How I teach Git](https://blog.ltgt.net/teaching-git/) by Thomas Broyer
279278
on his blog (also [on DEV.to](https://dev.to/tbroyer/how-i-teach-git-3nj3)).
280-
inspired to write it down by Julia Evans' (renewed) interest in Git,
281-
and her questions on social networks.
279+
Inspired by Julia Evans' (renewed) interest in Git and her questions on social networks.
282280
+ [Stacked Diffs (and why you should know about them)](https://newsletter.pragmaticengineer.com/p/stacked-diffs)
283281
by Gergely Orosz in The Pragmatic Engineer blog. Another article about Stacked Diffs
284282
can be found in [Git Rev News Edition #44](https://git.github.io/rev_news/2018/10/24/edition-44/).
@@ -308,7 +306,7 @@ __Light reading__
308306
by Ayu Adiati on Ayu's Notes On Blog (also [on DEV\.to](https://dev.to/adiatiayu/how-to-resolve-merge-conflicts-using-the-merge-editor-feature-on-vs-code-pic),
309307
as part of larger [Open-Source Series' Articles](https://dev.to/adiatiayu/series/15234)).
310308
+ [The Ultimate "git nah" Alias](https://laravel-news.com/the-ultimate-git-nah-alias)
311-
for abort their current changes and any possible operation in progress,
309+
to throw away current changes, untracked files and rebase state,
312310
by Paul Redmond on Laravel News.
313311
+ [Understanding Git: The history and internals](https://graphite.dev/blog/understanding-git)
314312
by Kenneth DuMez on the Graphite Blog (more about history and internals than about
@@ -328,7 +326,7 @@ __Light reading__
328326
+ [🙏 Please Add .gitattributes To Your Git Repository](https://dev.to/deadlybyte/please-add-gitattributes-to-your-git-repository-1jld)
329327
by Carl Saunders on DEV\.to (2020).
330328
+ A `.gitattributes` file [can be used to improve](https://github.com/github-linguist/linguist/blob/master/docs/overrides.md#using-gitattributes)
331-
language detection on GitHub, which is using
329+
language detection on GitHub, which is using the
332330
[Linguist](https://github.com/github-linguist/linguist) library.
333331

334332

@@ -347,13 +345,13 @@ __Easy watching and listening__
347345
__Git tools and sites__
348346

349347
+ [gitattributes.io](https://gitattributes.io/) is a service to generate
350-
[`.gitattributes`](https://git-scm.com/docs/gitattributes) file,
348+
[`.gitattributes`](https://git-scm.com/docs/gitattributes) files,
351349
similar to [gitignore.io](https://www.toptal.com/developers/gitignore/).
352350
+ [githistory.xyz](https://githistory.xyz/) is a service that allows to
353351
quickly browse the history of files in any git repo (from GitHub, GitLab, Bitbucket).
354352
Also available as Chrome, Firefox, and Visual Studio extensions,
355353
and as `git-file-history` command line tool (in Node.js).
356-
Mentioned in passing in [Git Rev News Edition #48]().
354+
Mentioned in passing in [Git Rev News Edition #48](https://git.github.io/rev_news/2019/02/27/edition-48/).
357355
+ Josh Branchaud (jbranchaud) list of
358356
[Today I Learned (TIL) tips about Git](https://github.com/jbranchaud/til#git).
359357
+ [lei](https://public-inbox.org/lei.html) is a command-line tool
@@ -372,9 +370,9 @@ __Git tools and sites__
372370
Written in Ruby.
373371
+ [GQL (Git Query Language)](https://amrdeveloper.github.io/GQL/)
374372
[[repo](https://github.com/AmrDeveloper/GQL)]
375-
is a SQL like language to perform queries on .git files,
376-
with supports of most of SQL features
377-
such as grouping, ordering and aggregations functions.<br>
373+
is a SQL-like language to perform queries on .git files,
374+
with support for many SQL features
375+
such as grouping, ordering and aggregation functions.<br>
378376
You can find more in [How I Created a SQL-like Language to Run Queries on Local Git Repositories](https://www.freecodecamp.org/news/gql-design-and-implementation/)
379377
article by Amr Hesham on freeCodeCamp.<br>
380378
See also the following tools:
@@ -426,7 +424,7 @@ __Git tools and sites__
426424
[2.43.0-rc2(1)](https://github.com/git-for-windows/git/releases/tag/v2.43.0-rc2.windows.1),
427425
[2.43.0-rc1(1)](https://github.com/git-for-windows/git/releases/tag/v2.43.0-rc1.windows.1),
428426
[2.43.0-rc0(1)](https://github.com/git-for-windows/git/releases/tag/v2.43.0-rc0.windows.1)
429-
+ GitLab [16.6](https://about.gitlab.com/releases/2023/11/16/gitlab-16-6-released/)
427+
+ GitLab [16.6](https://about.gitlab.com/releases/2023/11/16/gitlab-16-6-released/),
430428
[16.5.2](https://about.gitlab.com/releases/2023/11/14/gitlab-16-5-2-released/),
431429
[16.5.1, 16.4.2, 16.3.6](https://about.gitlab.com/releases/2023/10/31/security-release-gitlab-16-5-1-16-4-2-16-3-6-released/)
432430
+ Gerrit Code Review [3.6.8](https://www.gerritcodereview.com/3.6.html#368),

0 commit comments

Comments
 (0)