Skip to content

Commit 01a8513

Browse files
authored
Merge pull request #695 from stepnem/rn108copyedit
rn-108: minor copy edit
2 parents 6158632 + 06c68d2 commit 01a8513

File tree

1 file changed

+23
-24
lines changed

1 file changed

+23
-24
lines changed

‎rev_news/drafts/edition-108.md‎

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -31,22 +31,22 @@ This edition covers what happened during the months of January and February 2024
3131

3232
Junio Hamano, the Git maintainer, sent an email to the mailing list
3333
saying that when `git diff` was used with `--no-rename` instead of
34-
`--no-renames`, then rename detection was still performed. He
35-
wondered if that was a bug because either `--no-rename` should be
34+
`--no-renames`, rename detection was still performed. He
35+
wondered if that was a bug, because either `--no-rename` should be
3636
interpreted as being a shortened form of `--no-renames`, which is
37-
[a valid option](https://git-scm.com/docs/git-diff#Documentation/git-diff.txt---no-renames),
37+
[a valid option](https://git-scm.com/docs/git-diff#Documentation/git-diff.txt---no-renames)
3838
and should disable rename detection, or `--no-rename` should be
3939
rejected with an error message and termination of `git diff`.
4040

4141
Dragan Simic replied to Junio that indeed, in case the option is not
4242
recognized, an error message should be emitted.
4343

44-
Peff, alias Jeff King, also replied to Junio saying he tried
44+
Jeff King, alias Peff, also replied to Junio saying he tried
4545
`--no-foo`, which properly errored out. He then wondered if it could
46-
be a bug in the parse-option code that could be confused because
46+
be a bug in the `parse-options` code that could be confused because
4747
`git diff` has both `--[no-]rename-empty` and `--no-renames`. As
4848
there is an abbreviation ambiguity between `--no-rename-empty` and
49-
`--no-renames` when `--no-rename` is used, the parse-option code
49+
`--no-renames` when `--no-rename` is used, the `parse-options` code
5050
should not allow such an abbreviation and should error out.
5151

5252
He suggested, as an alternative to fixing the bug, that a new
@@ -58,20 +58,20 @@ This edition covers what happened during the months of January and February 2024
5858
René Scharfe replied to Peff that the issue came from a patch
5959
written in 2019 that disabled abbreviated options when there could
6060
be an ambiguity. The code handling abbreviations would trigger not
61-
only if the condition guarding it was satisfied but also if it was
61+
only if the condition guarding it was satisfied, but also if it was
6262
reached through a `goto` statement. The patch disabling abbreviated
63-
options only took care of condition guarding that code, but not of
64-
the goto statement. Along with these explanations, René provided a
63+
options only took care of the condition guarding that code, but not of
64+
the `goto` statement. Along with these explanations, René provided a
6565
patch fixing the bug.
6666

6767
Junio thanked René for spotting the "nasty" bug and said he agreed
6868
that the code was confusing.
6969

70-
René replied to Junio providing a simplification patch that removed
71-
the goto statement on top of his previous patch.
70+
René replied to Junio with a follow-up patch removing the
71+
`goto` statement.
7272

7373
Peff also replied to René's first patch wondering if it fixed all
74-
the possible issues. But then in a reply to himself Peff agreed that
74+
the possible issues, but then in a reply to himself agreed that
7575
René's patch was indeed fixing all the issues discussed.
7676

7777
Junio later merged both of René's patches, and they were part of the
@@ -85,7 +85,7 @@ This edition covers what happened during the months of January and February 2024
8585

8686
__Various__
8787

88-
- The Git project has been accepted as a [Mentor Organization](https://summerofcode.withgoogle.com/programs/2024/organizations/git) for Google Summer of Code (GSoC) 2024. We could still add project ideas to our [idea page](https://git.github.io/SoC-2024-Ideas/), and volunteers to (co-)mentor are still welcome. Feel free to chime in in [the corresponding thread](https://public-inbox.org/git/[email protected]/). Also, feel free to spread the word about Git's participation.
88+
- The Git project has been accepted as a [Mentor Organization](https://summerofcode.withgoogle.com/programs/2024/organizations/git) for Google Summer of Code (GSoC) 2024. We can still add project ideas to our [idea page](https://git.github.io/SoC-2024-Ideas/), and volunteers to (co-)mentor are still welcome. Feel free to join the discussion in [the corresponding thread](https://public-inbox.org/git/[email protected]/). Also, feel free to spread the word about Git's participation.
8989
+[Highlights from Git 2.44](https://github.blog/2024-02-23-highlights-from-git-2-44/)
9090
by Taylor Blau on GitHub Blog.
9191
+[GitLab's contributions to Git 2.44.0](https://about.gitlab.com/blog/2024/02/26/gitlabs-contributions-to-git-2-44-0/)
@@ -103,22 +103,22 @@ __Light reading__
103103
conditional configs, git blame and log with line ranges (`-L`),
104104
git blame with following, word diff, resolution reuse (`git rerere`).
105105
+[Git Tips 2: Some Subtle New Things](https://blog.gitbutler.com/git-tips-2-new-stuff-in-git/):
106-
git branch stuff (`--sort`, `--column`), safe forcepushing (`--force-with-lease`),
106+
git branch stuff (`--sort`, `--column`), safe force-pushing (`--force-with-lease`),
107107
SSH commit signing, push signing, `git maintenance`.
108108
+[Git Tips 3: Really Large Repositories and Monorepos](https://blog.gitbutler.com/git-tips-3-really-large-repositories/):
109109
prefetching, commit graph, filesystem monitor, partial cloning, sparse checkouts,
110-
[scalar](https://git-scm.com/docs/scalar) tool.
110+
the [scalar](https://git-scm.com/docs/scalar) tool.
111111
+[Git Trailers](https://alchemists.io/articles/git_trailers) by Brooke Kuhlmann. Learn how to
112-
leverage commit metadata for powerful automations and more humanreadable commit messages.
112+
leverage commit metadata for powerful automations and more human-readable commit messages.
113113
+[More Expressive Commits with Gitmoji ☺️](https://www.git-tower.com/blog/gitmoji/)
114114
by Bruno Brito on Tower’s blog.
115115
+[Gitmoji](https://gitmoji.dev/) was first mentioned in [Git Rev News Edition #47](https://git.github.io/rev_news/2019/01/23/edition-47/),
116116
though then under a [different URL](https://gitmoji.carloscuesta.me/)
117117
(which now redirects to the current one).
118-
+ The similar [Emoji-Log](https://github.com/ahmadawais/Emoji-Log) commit log messages spec standard
118+
+ The similar [Emoji-Log](https://github.com/ahmadawais/Emoji-Log) commit log messages standard
119119
was mentioned in [Git Rev News Edition #101](https://git.github.io/rev_news/2023/07/31/edition-101/).
120120
+[My Git pre-commit hook contained a footgun](https://blog.plover.com/prog/git/hook-disaster.html)
121-
by Mark Dominus (陶敏修) on his The Universe of Discourse blog.
121+
by Mark Dominus (陶敏修) on his blog (The Universe of Discourse).
122122
+ Julia Evans continues her series of blog posts about Git with
123123
[Dealing with diverged git branches](https://jvns.ca/blog/2024/02/01/dealing-with-diverged-git-branches/)
124124
and [Popular git config options](https://jvns.ca/blog/2024/02/16/popular-git-config-options/).
@@ -133,27 +133,26 @@ __Light reading__
133133
(includes [video version](https://youtu.be/TL_t3aOXumo)).
134134
+[My favourite Git commit](https://dhwthompson.com/2019/my-favourite-git-commit) (2019)
135135
by David Thompson on his blog,
136-
about the benefits of good commit messages (the example is one character change).<br>
136+
about the benefits of good commit messages (the example is a one-character change).<br>
137137
Includes links to the following recommended articles on the same topic:
138138
+[Telling stories through your commits](https://blog.mocoso.co.uk/posts/talks/telling-stories-through-your-commits/) by Joel Chippindale (2016).
139139
+[A branch in time](https://tekin.co.uk/2019/02/a-talk-about-revision-histories) by Tekin Süleyman (2019).
140-
141140
+[Contribution experience report: Git](https://antonin.delpeuch.eu/posts/contribution-experience-report-git/)
142141
by Antonin Delpeuch on his blog.
143142

144143

145144
__Easy watching__
146145

147146
+[So You Think You Know Git - FOSDEM 2024](https://www.youtube.com/watch?v=aolI_Rz0ZqY)
148-
on YouTube, 47 minutes long.
147+
by Scott Chacon on YouTube, 47 minutes long (mentioned above).
149148

150149

151150
__Git tools and sites__
152151

153152
+[Milestoner](https://alchemists.io/projects/milestoner) by Brooke Kuhlmann. Significant updates
154153
have been made where you can build release notes from your commit messages based on Git notes and
155-
trailers in multiple formats: Text, ASCII Doc, Markdown, and HTML. Includes automatic calculation
156-
of your next version and automatic tagging too.
154+
trailers in multiple formats: console, AsciiDoc, Markdown, and HTML. Includes automatic calculation
155+
of your next version and automatic tagging.
157156
+[git-cliff](https://git-cliff.org/) is a highly customizable changelog generator
158157
using regex-powered custom parsers that can generate changelog files for any Git repository
159158
which follows the [conventional commits](https://www.conventionalcommits.org/) specification.
@@ -180,7 +179,7 @@ __Git tools and sites__
180179
[2.44.0-rc2(1)](https://github.com/git-for-windows/git/releases/tag/v2.44.0-rc2.windows.1),
181180
[2.44.0-rc1(1)](https://github.com/git-for-windows/git/releases/tag/v2.44.0-rc1.windows.1),
182181
[2.44.0-rc0(1)](https://github.com/git-for-windows/git/releases/tag/v2.44.0-rc0.windows.1)
183-
+ GitLab [16.9.1, 16.8.3, 16.7.6](https://about.gitlab.com/releases/2024/02/21/security-release-gitlab-16-9-1-released/)
182+
+ GitLab [16.9.1, 16.8.3, 16.7.6](https://about.gitlab.com/releases/2024/02/21/security-release-gitlab-16-9-1-released/),
184183
[16.9](https://about.gitlab.com/releases/2024/02/15/gitlab-16-9-released/),
185184
[16.8.2, 16.7.5, 16.6.7](https://about.gitlab.com/releases/2024/02/07/security-release-gitlab-16-8-2-released/)
186185
+ Gerrit Code Review [3.7.7](https://www.gerritcodereview.com/3.7.html#377),

0 commit comments

Comments
(0)