Skip to content

Commit 80c6418

Browse files
committed
Supplied some tiny fixes and rephrasings.
1 parent c7d8443 commit 80c6418

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

‎rev_news/drafts/edition-81.md‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -28,37 +28,37 @@ This edition covers what happened during the month of October 2021.
2828
Johannes Sixt sent a small patch series about improving C++ (also
2929
called 'cpp') support in the userdiff mechanism. This mechanism is
3030
used by Git to generate diffs that are customized to specific
31-
programming languages (like C, shell, Perl, matlab, etc) or markup
32-
languages (like HTML, markdown tex, etc).
31+
programming languages (like C, shell, Perl, MATLAB, etc.) or markup
32+
languages (like HTML, Markdown, TeX, etc.).
3333

3434
Especially one of the patches splits the regex that was matching all
3535
the numbers into 3 different regexes:
3636

37-
- one for floatingpoint numbers that begin with a decimal point,
37+
- one for floating point numbers that begin with a decimal point,
3838
- one for decimal and octal integers as well as other
39-
floatingpoint numbers, and
39+
floating point numbers, and
4040
- one for hexadecimal and binary integers.
4141

4242
The result is that expressions like `1+2`, `1.5-e+2+f` and `.l` are
4343
not considered numbers any more and are properly parsed for diff
4444
purposes in C++ files.
4545

4646
Another patch in the series allows single-quote characters as digit
47-
separators like in `3.141'592'654` or `0xdead'beaf` according to the
48-
C++17 standard.
47+
separators according to the C++17 standard, like in `3.141'592'654`
48+
or `0xdead'beaf`.
4949

5050
The third and last patch prevents the `<=>` generalized comparison
51-
operator (also called 'spaceship' operator) allowed since C++20 from
51+
operator (also called 'spaceship' operator) introduced in C++20 from
5252
being split into `<=` and `>`.
5353

54-
Ævar Arnfjörð Bjarmason replied to Johannes suggesting him to add a
54+
Ævar Arnfjörð Bjarmason replied to Johannes suggesting to add a
5555
few tests in the `t/t4034/cpp/` directory, where test files for the
5656
cpp userdiff mechanism reside.
5757

5858
Johannes agreed with Ævar and sent a
5959
[second version](https://lore.kernel.org/git/[email protected]/)
6060
of his patch series. This series included 2 new patches that
61-
improved existing tests, and added new tests for problematic behavior
61+
improved existing tests and added new tests for problematic behavior
6262
that the other patches were fixing.
6363

6464
Ævar commented on this series saying that it was much improved, but
@@ -71,7 +71,7 @@ This edition covers what happened during the month of October 2021.
7171

7272
- some tests could be added for code comments, as he wondered if
7373
tokens that often occur in natural language, like `"` and `&`,
74-
are still correctly handled when they appear in code comments.
74+
were still correctly handled when they appeared in code comments.
7575

7676
Johannes agreed with the second point, but wasn't interested in
7777
working on the others.
@@ -83,14 +83,14 @@ This edition covers what happened during the month of October 2021.
8383
[third version](https://lore.kernel.org/git/[email protected]/)
8484
of his patch series. In this new version test cases for single-quote
8585
characters as digit separators and the `<=>` generalized comparison
86-
operator were moved to a new commit, before the commits supporting
86+
operator were moved to a new commit before the commits supporting
8787
these features.
8888

89-
Later-on, Johannes noticed that the single-quote character as digit
90-
separator is problematic and requires a more sophisticated
91-
implementation. For example, as implemented the character literal
92-
`'.'` would be split into `'.` and `'.` The support for digit separator
93-
was eventually reverted.
89+
Lateron, Johannes [noticed](https://lore.kernel.org/git/[email protected]/)
90+
that the single-quote character as digit separator is problematic
91+
and requires a more sophisticated implementation. For example, as
92+
implemented the character literal `'.'` would be split into `'.`
93+
and `'`. The support for digit separator was eventually reverted.
9494

9595
This patch series was then merged into the master branch, so that
9696
Git 2.34 that was recently released has better support for C++ in
@@ -145,7 +145,7 @@ __Various__
145145
by Julia Schmidt on Dev Class.
146146
*[Require pull requests without requiring reviews](https://github.blog/changelog/2021-11-10-require-pull-requests-without-requiring-reviews/) on GitHub.
147147
*[Deprecating Atlassian account password for Bitbucket API and Git activity](https://bitbucket.org/blog/deprecating-atlassian-account-password-for-bitbucket-api-and-git-activity)
148-
(for Git over HTTPS), on Bitbucket.
148+
(for Git over HTTPS) on Bitbucket.
149149

150150
__Light reading__
151151

@@ -162,7 +162,7 @@ __Light reading__
162162
*[Oh My Git!](https://ohmygit.org/) game by bleeptrack and blinry
163163
was mentioned in [Git Rev News Edition #72 (February 27th, 2021)](https://git.github.io/rev_news/2021/02/27/edition-72/).
164164
* The “[Advanced Git](https://css-tricks.com/cherry-picking-commits-in-git/)” series
165-
by Tobias Günther on CSS-Tricks, courtesy of Git Tower git client,
165+
by Tobias Günther on CSS-Tricks, courtesy of the Tower Git client,
166166
(mentioned in [Git Rev News #80](https://git.github.io/rev_news/2021/10/30/edition-80/)),
167167
continues:
168168
*[Better Collaboration With Pull Requests](https://css-tricks.com/better-collaboration-with-pull-requests/)
@@ -183,7 +183,7 @@ __Light reading__
183183
by Lee Atchison on Info World.
184184
* You can find various arguments for and against monorepos in Git Rev News editions
185185
[#4](https://git.github.io/rev_news/2015/06/03/edition-4/), [#9](https://git.github.io/rev_news/2015/11/11/edition-9/), [#47](https://git.github.io/rev_news/2019/01/23/edition-47/) (pros and cons), [#72](https://git.github.io/rev_news/2021/02/27/edition-72/), [#78](https://git.github.io/rev_news/2021/08/31/edition-78/),
186-
not counting articles about improving the performance of large repositories, like monorepos usually are.
186+
not counting articles about improving the performance of large repositories, which monorepos usually are.
187187
*[How to do pull request reviews](https://dev.to/mage_ai/how-to-do-pull-request-reviews-mm6)
188188
by Mage company on DEV.to.
189189
*[Git Rebase for Preventing Merge Commits](https://dev.to/jenc/git-rebase-for-preventing-merge-commits-2len)
@@ -196,17 +196,17 @@ __Light reading__
196196

197197
__Git tools and sites__
198198

199-
*[Commitlint](https://commitlint.js.org/#/) is a tool, written in JavaScript and running on Node.js (an npm tool),
200-
that helps your team with adhering to a commit convention.
199+
*[`commitlint`](https://commitlint.js.org/#/) is a tool written in JavaScript and running on Node.js
200+
(that is, an npm tool) that helps your team with adhering to a commit convention.
201201
*[Conventional Changelog](https://github.com/conventional-changelog/conventional-changelog)
202202
is an npm tool to generate changelogs and release notes from a project's commit messages and metadata.
203203
*[Git Command Explorer](https://gitexplorer.com/) is a web application
204204
to help you find the right commands you need
205205
without digging through the web,
206206
made by Summitech company.
207207
*[Arlo's Commit Notation](https://github.com/RefactoringCombos/ArlosCommitNotation)
208-
is a notation for small commits messages that show
209-
the risk involved in each step, and the author's intention,
208+
is a notation for small commit messages that shows
209+
the risk involved in each step and the author's intention,
210210
conveyed in the first 3 characters of the commit summary line.
211211

212212
## Credits

0 commit comments

Comments
(0)