Skip to content

Commit 3d1d364

Browse files
committed
rn-134: Tiny corrections and rephrasings (part 1). Please scrutinize.
1 parent 808c9c2 commit 3d1d364

1 file changed

Lines changed: 19 additions & 19 deletions

File tree

rev_news/drafts/edition-134.md

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -46,21 +46,21 @@ This edition covers what happened during the months of March and April 2026.
4646
`--src-prefix`/`--dst-prefix`, `--full-index`, `--abbrev`, `-R`,
4747
`--output-indicator-*`, the pickaxe options `-S`/`-G`, and so on) is
4848
silently ignored when combined with `-L`. The hand-rolled output
49-
also omits the `index` lines, `new file mode` headers, and funcname
49+
also omits the `index` lines, `new file mode` headers, and `funcname`
5050
context in `@@` hunk headers that the standard pipeline produces.
5151

5252
Michael Montalbo opened the discussion by sending a four-patch
53-
series that finally addresses this long-standing limitation. The
54-
series explicitly replaced an earlier attempt of his,
53+
series that finally addressed this long-standing limitation. The
54+
series explicitly replaced an earlier attempt of him,
5555
["line-log: fix `-L` with pickaxe options"](https://lore.kernel.org/git/pull.2061.git.1772651484.gitgitgadget@gmail.com/),
5656
which had taken the opposite approach of *rejecting* `-S`/`-G` when
5757
combined with `-L`; the new direction is to make those options
5858
*work* instead. Patch 1 carries over a crash fix from that previous
59-
attempt unchanged. Patch 2 is the core change. Patch 3 adds an
60-
extensive set of tests for the newly-working options. Patch 4
59+
attempt unchanged, patch 2 contains the core change, patch 3 adds an
60+
extensive set of tests for the newly-working options, and patch 4
6161
updates the documentation.
6262

63-
Patch 1 fixes a real assertion failure that could be triggered by
63+
In detail, patch 1 fixes a real assertion failure that could be triggered by
6464
combining `-L` with pickaxe options across a merge that contains a
6565
rename, an issue originally reported by Matthew Hughes. Inside
6666
`queue_diffs()`, the caller's `diff_options` was being reused for
@@ -85,7 +85,7 @@ This edition covers what happened during the months of March and April 2026.
8585
travel with its filepair through the rest of the pipeline. As a side
8686
effect, `line_log_print()` shrinks down to little more than a
8787
`diffcore_std()` call followed by `diff_flush()`, the
88-
`-L`-implies-`--patch` default is wired up in revision setup rather
88+
"`-L` implies `--patch`" default is wired up in revision setup rather
8989
than forced at output time, and `diff_filepair_dup()` is switched
9090
from `xmalloc` to `xcalloc` so that newly added fields (including
9191
the `line_ranges`) are zero-initialized.
@@ -99,14 +99,14 @@ This edition covers what happened during the months of March and April 2026.
9999
measurable regression.
100100

101101
There is, of course, a user-visible output change: `-L` output now
102-
includes `index` lines, `new file mode` headers, and funcname
102+
includes `index` lines, `new file mode` headers, and `funcname`
103103
context in `@@` hunk headers that were previously absent. Tools that
104104
parse `-L` output may need to handle these additional lines. The
105105
cover letter is upfront about this, and also lists two limitations
106106
that are deliberately left for follow-up work: `line_log_print()`
107-
still calls `show_log()` and `diff_flush()` directly rather than
107+
still calling `show_log()` and `diff_flush()` directly rather than
108108
going through `log_tree_diff_flush()`, and the non-patch diff
109-
formats (`--raw`, `--numstat`, `--stat`, etc.) remain unimplemented
109+
formats (`--raw`, `--numstat`, `--stat`, etc.) remaining unimplemented
110110
for `-L`.
111111

112112
Junio Hamano, the Git maintainer, replied to the cover letter the
@@ -136,7 +136,7 @@ This edition covers what happened during the months of March and April 2026.
136136
Michael had inadvertently turned the new prose into a code block.
137137
Kristoffer recommended dropping the indentation in favour of a plain
138138
list-continuation marker so the text would render as regular
139-
paragraph text, "flush to the left." Michael thanked him and folded
139+
paragraph text, that is, "flush to the left." Michael thanked him and folded
140140
the fix into his next iteration.
141141

142142
For readers less familiar with the relevant pieces of the diff
@@ -166,7 +166,7 @@ This edition covers what happened during the months of March and April 2026.
166166

167167
After the initial round of review, Michael sent
168168
[version 2](https://lore.kernel.org/git/pull.2065.v2.git.1773714095.gitgitgadget@gmail.com)
169-
of the series. The only structural change from v1 was that patch 4
169+
of the series. The only structural change from v1 is that patch 4
170170
now uses a list-continuation marker instead of indentation in
171171
`Documentation/line-range-options.adoc`, addressing Kristoffer's
172172
review feedback so the new paragraph renders correctly. The
@@ -230,7 +230,7 @@ As always, we welcome your thoughts and feedback!_
230230
* **How did you initially become interested in contributing to Git, and what
231231
motivated you to choose it as your GSoC project?**
232232

233-
Back in 2021, a friend showed me a video about GSoC and it seemed completely
233+
Back in 2021, a friend showed me a video about GSoC, and it seemed completely
234234
out of reach at the time. Fast forward to late 2023, the same friend suggested
235235
we finally give it a real shot. We both spent about 4 months contributing to
236236
open-source projects to build up experience. Both of us got selected for GSoC
@@ -412,7 +412,7 @@ __Various__
412412
+ [What’s new in Git 2.54.0?](https://about.gitlab.com/blog/whats-new-in-git-2-54-0/)
413413
by Patrick Steinhardt on GitLab Blog. Describes
414414
pluggable object databases support,
415-
easier editing of your commit history with `git history` command,
415+
easier editing of your commit history with the `git history` command,
416416
a native replacement for [git-sizer(1)](https://github.com/github/git-sizer): `git repo structure`,
417417
and new infrastructure for repository maintenance.
418418
+ [Highlights from Git 2.54](https://github.blog/open-source/git/highlights-from-git-2-54/)
@@ -438,8 +438,8 @@ __Various__
438438

439439
+ [An update on GitHub availability](https://github.blog/news-insights/company-news/an-update-on-github-availability/)
440440
by Vlad Fedorov on GitHub Blog; mentions
441-
April 23 merge queue incident (inadvertently reverted changes with the squash merge method) and
442-
April 27 search-related incident (Elasticsearch subsystem stopped returning search results).
441+
the April 23 merge queue incident (inadvertently reverted changes with the squash merge method) and
442+
the April 27 search-related incident (Elasticsearch subsystem stopped returning search results).
443443
+ [GitHub says sorry and vows to do better as uptime slips and devs complain](https://www.theregister.com/2026/04/29/github_says_sorry_and_says/)
444444
by Richard Speed in The Register.
445445
+ [Securing the git push pipeline: Responding to a critical remote code execution vulnerability](https://github.blog/security/securing-the-git-push-pipeline-responding-to-a-critical-remote-code-execution-vulnerability/)
@@ -490,15 +490,15 @@ __Easy watching__
490490
__Git tools and sites__
491491
+ "[High Performance Git](https://gitperf.com/)", a book by Ted Nyman
492492
(online and [free PDF](https://gitperf.com/pdf.html)).
493-
The book is about different layers, and the performance costs of each one.
493+
The book is about different layers inside Git and the performance costs of each one.
494494
+ [GitChop](https://bendansby.com/apps/gitchop.html) - a visual `rebase -i`
495495
(interactive rebase) for Mac. Drag-reorder commits,
496496
split one commit into many by assigning hunks, reword in place.
497497
+ Compare [rebase-editor: Simple terminal based sequence editor for git interactive rebase.](https://github.com/sjurba/rebase-editor)
498498
(mentioned in [Git Rev News Edition #26](https://git.github.io/rev_news/2017/04/19/edition-26/)), and
499499
[Git Interactive Rebase Tool](https://gitrebasetool.mitmaro.ca/)
500500
(mentioned in [Git Rev News Edition #49](https://git.github.io/rev_news/2019/03/20/edition-49/)).
501-
+ [Git Shield](https://github.com/vekexasia/git-shield) is a set of git hooks
501+
+ [Git Shield](https://github.com/vekexasia/git-shield) is a set of Git hooks
502502
that blocks API keys, secrets, and contextual PII before code leaves your machine.
503503
Scans secrets via [`gitleaks`](https://gitleaks.io/) (API keys, tokens, credentials, private keys)
504504
and PII via [OpenAI Privacy Filter](https://github.com/openai/privacy-filter) (emails, phone numbers, names, addresses).
@@ -535,7 +535,7 @@ __Git tools and sites__
535535
It can find and fix many common security issues in typical GitHub Actions CI/CD setups.
536536
Written in Rust, under MIT license.
537537
+ [Rebass](https://adamf.github.io/rebass/) is a service
538-
that turns a git history into music.<br>
538+
that turns a Git history into music.<br>
539539
Each commit becomes one bar of a four-beat groove.
540540
A steady _bass_ and _pad_ ground the repo's key,
541541
while a _lead_ voice plays a melody derived from each commit's SHA.

0 commit comments

Comments
 (0)