Skip to content

Commit 6154855

Browse files
committed
Supplied some fixes and rephrasings, please scrutinize. Great article and links!
1 parent bdfe3e4 commit 6154855

File tree

1 file changed

+45
-44
lines changed

1 file changed

+45
-44
lines changed

rev_news/drafts/edition-118.md

Lines changed: 45 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ This edition covers what happened during the months of November and December 202
2222
- Git participates in [Outreachy's December 2024 to March 2025 round](https://www.outreachy.org/alums/2024-12/):
2323

2424
- Seyi Kuforiji is working on the "Convert unit tests to use the
25-
clar testing framework" project. He is mentored by Patrick
25+
[clar testing framework](https://github.com/clar-test)" project. He is mentored by Patrick
2626
Steinhardt and Phillip Wood and posting updates [on his gitlab.io blog](https://seyi-kuforiji-902b48.gitlab.io/posts/index.html)
2727
while his work is on [his GitHub repository](https://github.com/Seyi007/git).
2828

29-
- Usman Akinyemi is working on the "Finish adding a 'os-version'
29+
- Usman Akinyemi is working on the "Finish adding an 'os-version'
3030
capability to Git protocol v2" project. He is mentored by
3131
Christian Couder and posting updates [on his hashnode.dev blog](https://uniqueusman.hashnode.dev/)
3232
while his work is on [his GitLab repository](https://gitlab.com/Unique-Usman/git/-/branches).
@@ -45,14 +45,14 @@ This edition covers what happened during the months of November and December 202
4545

4646
### Support
4747

48-
+ [./configure fails to link test program due to missing dependencies](https://lore.kernel.org/git/GV1PR02MB848925A79A9DD733848182D58D662@GV1PR02MB8489.eurprd02.prod.outlook.com/)
48+
+ [`./configure` fails to link test program due to missing dependencies](https://lore.kernel.org/git/GV1PR02MB848925A79A9DD733848182D58D662@GV1PR02MB8489.eurprd02.prod.outlook.com/)
4949

5050
Last September Henrik Holst reported an issue when trying to compile
51-
Git 2.44.0 with HTTPS/curl support on LFS 12.1. The 'configure' script
51+
Git 2.44.0 with HTTPS/curl support on [LFS](https://www.linuxfromscratch.org/) 12.1. The `configure` script
5252
failed to detect libcurl's dependencies properly when trying to link
5353
statically.
5454

55-
The issue occurred because the 'configure' script only used the
55+
The issue occurred because the `configure` script only used the
5656
`-lcurl` build flag without running `pkg-config --libs libcurl` to
5757
add build flags for dependencies like `zstd` that libcurl
5858
needs. Henrik found that manually setting the LDFLAGS environment
@@ -61,17 +61,17 @@ This edition covers what happened during the months of November and December 202
6161
succeed. This sparked a broader discussion about Git's build system
6262
situation.
6363

64-
Looking at 'configure.ac', Junio Hamano, the Git maintainer, noted
64+
Looking at `configure.ac`, Junio Hamano, the Git maintainer, noted
6565
that `pkg-config` isn't used at all, instead `curl-config --libs` is
66-
used to detect curl's flags. Even if the 'configure' script was
66+
used to detect curl's flags. Even if the `configure` script was
6767
added early in the history of the Git project, Junio said it was an
6868
afterthought and nobody has considered "upgrading" from
6969
`curl-config` to `pkg-config` for dependency detection.
7070

7171
In fact, our own Jakub Narębski
72-
[initially added the 'configure' script](https://lore.kernel.org/git/[email protected]/)
73-
back in 2006 to make it much easier to create RPM spec file for Git.
74-
Creating `*.spec` file is especially easy when the
72+
[initially added the `configure` script](https://lore.kernel.org/git/[email protected]/)
73+
back in 2006 to make it much easier to create the RPM spec file for Git.
74+
Creating `*.spec` files is especially easy when the
7575
compilation follows traditional `configure && make && make install`
7676
steps.
7777

@@ -94,7 +94,7 @@ This edition covers what happened during the months of November and December 202
9494
by Sibi Siddharthan as a third build system with the main goal of
9595
improving the build experience for developers on Windows.
9696

97-
Soon after Patrick's reply, the Git Contributors' Summit happened
97+
Soon after Patrick's reply, the Git Contributors' Summit took place,
9898
and the
9999
["Modern Build System" topic](https://lore.kernel.org/git/[email protected]/)
100100
was discussed there. Patrick Steinhardt raised concerns about
@@ -165,12 +165,12 @@ This edition covers what happened during the months of November and December 202
165165
documentation, fix conflicts with in-flight patches, and address the
166166
various technical concerns raised during review.
167167

168-
Eventually the
168+
Eventually
169169
[version 11 of the patch series](https://lore.kernel.org/git/[email protected]/)
170170
was merged and will be part of Git v2.48.0 that should be released
171171
in the next few weeks. It should be a properly supported modern
172172
build system that can be faster and more easily configurable than
173-
the three existing ones which will hopefully get deprecated over
173+
the three existing ones, which will hopefully get deprecated over
174174
time.
175175

176176
The merged patch series especially adds
@@ -205,21 +205,21 @@ __Various__
205205
+ [EMERALDWHALE exploits vulnerable Git configuration files](https://www.developer-tech.com/news/emeraldwhale-exploits-vulnerable-git-configuration-files/)
206206
by Ryan Daws on Developer Tech News, about a global operation known as EMERALDWHALE,
207207
which has stolen over 15000 cloud service credentials by exploiting exposed Git configuration files
208-
(via misconfigured web services, which were exposing `.git` directory of a private repository).
208+
(via misconfigured web services, which were exposing the `.git` directories of private repositories).
209209
+ [Abusing Git branch names to compromise a PyPI package](https://lwn.net/Articles/1001215/)
210-
(caused by project automatically processing pull requests with a flawed script),
210+
(caused by a project automatically processing pull requests with a flawed script),
211211
short post by daroc on LWN\.net.
212212

213213

214214
__Light reading__
215215

216216
+ [NonStop discussion around adding Rust to Git](https://lwn.net/Articles/998115/)
217217
by Daroc Alden on LWN\.net. The Git project discussed the prospect in January 2024,
218-
and then again at the Git Contributor's Summit in September 2024.
219-
+ Git Contributor's Summit 2024 was mentioned in
218+
and then again at the Git Contributors' Summit in September 2024.
219+
+ The Git Contributors' Summit 2024 was mentioned in
220220
[Git Rev News Edition #115](https://git.github.io/rev_news/2024/09/30/edition-115/),
221-
with link to notes as posts to git mailing list (also available in read-only Google Docs),
222-
and repo with notes from breakout unconference sessions.
221+
with links to notes as posts to the Git mailing list (also available in read-only Google Docs)
222+
and a repo with notes from the breakout unconference sessions.
223223
+ [Vigilante Justice on GitHub: GitHub Graffiti](https://trufflesecurity.com/blog/vigilante-justice-on-github)
224224
by Dylan Ayrey on The Dig (Truffle Security Co. blog), about
225225
how you can paint funny pixel art (graffiti) with fake commit Git histories
@@ -234,7 +234,7 @@ __Light reading__
234234
(`--format=reference`).
235235
+ [Optimizing Your Repository for Speed and Efficiency](https://dev.to/this-is-learning/optimizing-your-repository-for-speed-and-efficiency-5co2) and
236236
[Using Git Maintenance in GitHub Actions: Optimize Your Repositories Automatically](https://dev.to/this-is-learning/using-git-maintenance-in-github-actions-optimize-your-repositories-automatically-39ka)
237-
by Emanuele Bartolesi for This is Learning on DEV\.to create 2 part series
237+
by Emanuele Bartolesi for [This is Learning on DEV\.](https://dev.to/this-is-learning), which constitute the 2 part series
238238
[Streamline Your Workflow with the Git Maintenance Command](https://dev.to/kasuken/series/29808).
239239
+ The [`git maintenance`](https://git-scm.com/docs/git-maintenance) command
240240
was mentioned in [Git Tips 2: Some Subtle New Things](https://blog.gitbutler.com/git-tips-2-new-stuff-in-git/)
@@ -243,12 +243,12 @@ __Light reading__
243243
+ [Demystifying git submodules](https://www.cyberdemon.org/2024/03/20/submodules.html)
244244
by Dmitry Mazin on his blog.
245245
+ [Fearless Rebasing](https://blog.gitbutler.com/fearless-rebasing/) by Scott Chacon on GitButler Blog
246-
is about "first class" conflict support in GitButler, based on Jujutsu concept of
246+
is about "first class" conflict support in GitButler, based on the Jujutsu concept of
247247
"[first class conflicts](https://martinvonz.github.io/jj/latest/conflicts/)".
248248
+ The article does not mention the built-in (but optional) [git rerere](https://git-scm.com/docs/git-rerere)
249-
mechanism of reusing recorded resolution of conflicted merges
249+
mechanism of reusing recorded resolutions of conflicting merges
250250
(described for example in [Git Tools - Rerere](https://git-scm.com/book/en/v2/Git-Tools-Rerere)
251-
section in "Pro Git" 2nd Edition), that can help when repeatedly rebasing.
251+
section in "Pro Git" 2nd Edition), that can help when rebasing repeatedly.
252252
+ In order to reduce the pain of resolving merge conflicts,
253253
and allow a merge or a rebase to be saved, tested, interrupted, published,
254254
and collaborated on while it is in progress, one can also use
@@ -261,26 +261,27 @@ __Light reading__
261261
written in Rust, was first mentioned in
262262
[Git Rev News Edition #85](https://git.github.io/rev_news/2022/03/31/edition-85/).
263263
+ [Stacked Branches with GitButler](https://blog.gitbutler.com/stacked-branches-with-gitbutler/)
264-
by Scott Chacon on GitButler Blog.
265-
With 0.14 release GitButler can now manage dependent branches that are stacked,
264+
by Scott Chacon on the GitButler Blog.
265+
With the 0.14 release, GitButler can now manage dependent branches that are stacked,
266266
including managing stacked GitHub PRs (Pull Requests).
267267
+ See also [Understanding the Stacked Pull Requests Workflow](https://www.git-tower.com/blog/stacked-prs/) by Bruno Brito on Tower's blog,
268268
mentioned in [Git Rev News Edition #111](https://git.github.io/rev_news/2024/05/31/edition-111/)
269269
together with various other articles and tools about stacked diffs, stacked PRs, and stacked branches.
270270
+ See also [Rethinking code reviews with stacked PRs](https://www.aviator.co/blog/rethinking-code-reviews-with-stacked-prs/#)
271-
by Ankit Jain on Aviator blog,
271+
by Ankit Jain on the Aviator blog,
272272
mentioned in [Git Rev News Edition #115](https://git.github.io/rev_news/2024/09/30/edition-115/)
273273
with links to more sites and tools related to stacked PRs, etc.
274274
+ [~~Enforcing~~ Git Branch Naming Standards: ~~Tools and~~ Tips for Developers](https://dev.to/oj_redifined/enforcing-git-branch-naming-standards-tools-and-tips-for-developers-1p27)
275275
by Ojay on DEV\.to (despite the title, the article does not include any technical way of
276-
helping to enforce or even remind about branch naming conventions).
276+
helping to enforce or even remind of branch naming conventions).
277277
+ [9 ways to manage large creative projects with version control tools](https://www.xda-developers.com/manage-large-creative-projects-with-version-control-tools/)
278278
by Ruby Helyer on XDA Developers. Mentions CI/CD, Git LFS, commit message and file naming conventions.
279279
+ Adam Ruka posted a series of articles on working with the Git source control system:
280280
1. [GitFlow considered harmful](https://www.endoflineblog.com/gitflow-considered-harmful) (2015)
281281
2. [Follow-up to 'GitFlow considered harmful'](https://www.endoflineblog.com/follow-up-to-gitflow-considered-harmful) (2015)
282282
3. [OneFlow – a Git branching model and workflow](https://www.endoflineblog.com/oneflow-a-git-branching-model-and-workflow) (2017)
283283
4. [Implementing OneFlow on GitHub, BitBucket and GitLab](https://www.endoflineblog.com/implementing-oneflow-on-github-bitbucket-and-gitlab) (2021)
284+
284285
[GitFlow: A successful Git branching model](https://nvie.com/posts/a-successful-git-branching-model/)
285286
was a blog post by Vincent Driessen from 2010, with note of reflection from 2020;
286287
the original author now suggest to adopt a much simpler workflow (like
@@ -298,8 +299,8 @@ __Easy watching__
298299
__Git tools and sites__
299300

300301
+ [bus-factor-explorer](https://github.com/JetBrains-Research/bus-factor-explorer)
301-
by JetBrains Research is a web app for exploring Bus Factor of GitHub projects
302-
by analyzing the commit history. Available as to install as a Docker image.
302+
by JetBrains Research is a web app for exploring the Bus Factor of GitHub projects
303+
by analyzing the commit history. Preferably run as a Docker image.
303304
The repository includes evaluation results for 935 popular repositories on GitHub.
304305
There is also a short video about the tool on YouTube: <https://youtu.be/uIoV79N14z8>.
305306
Written in Kotlin (with evaluation done with Jupyter notebooks), under MIT license.
@@ -308,31 +309,31 @@ __Git tools and sites__
308309
articles mentioned in [Git Rev News Edition #117](https://git.github.io/rev_news/2024/11/30/edition-117/)
309310
(the previous edition), together with accompanying links.
310311
+ [Anonymous GitHub](https://anonymous.4open.science/) is a service
311-
that allows you to anonymize your GitHub repository for double-blind scientific review
312-
(of scientific article where source code is to be made available for open science reasons).
312+
that allows you to anonymize your GitHub repository for double-blind scientific reviews
313+
(of scientific articles where source code is to be made available for open science reasons).
313314
Several anonymization options are available to ensure that you do not break the double-anonymize,
314315
such as removing links, images or specific terms.
315316
The goal is to make is as easy as possible for the reviewer to explore and review the repository.
316-
+ [Git.News](https://git.news/) is a website which provides infinite newsfeed of
317+
+ [Git.News](https://git.news/) is a website which provides an infinite newsfeed of
317318
trending repositories from GitHub, HackerNews & Reddit
318319
(which you can then filter by programming language).
319320
+ [Octobox](https://octobox.io/) is a service to help manage GitHub notifications.
320321
Includes optional GitHub app to add live information on issue, PR, and CI status, labels, authors, etc.
321-
Octobox is free for open source projects with basic notifications for private projects.
322-
+ [Filestash](https://www.filestash.app/) is Dropbox-like enterprise-grade file manager,
322+
Octobox is free for open source projects and the use of basic notifications for private projects.
323+
+ [Filestash](https://www.filestash.app/) is a Dropbox-like enterprise-grade file manager,
323324
connecting your storage with your identity provider and authorisations.
324325
It adds a web interface to storage solutions like S3 buckets, SFTP/FTPS server, Git repositories, etc.
325-
Self-hosted solution is free; it can be done using Docker image.
326+
Self-hosted deployment is free; it can be done using a Docker image.
326327
Written in Go and JavaScript, under AGPLv3 license.
327328
Demo available at <https://demo.filestash.app/>,
328329
source code at <https://github.com/mickael-kerjean/filestash>.
329330
+ [DistGit (Distribution Git)](https://github.com/release-engineering/dist-git)
330331
is Git with additional data storage, designed to hold content of source RPMs
331-
(Linux distribution packages). Written in Python, under the MIT license,
332+
(Linux distribution packages). Written in Python, under MIT license,
332333
but with scripts/httpd/upload.cgi under GPLv1,
333-
and dist-git-client sub-directory under GPLv2+.
334+
and the dist-git-client subdirectory under GPLv2+.
334335
+ [wikmd](https://linbreux.github.io/wikmd/) is a file-based wiki, with
335-
documents written in Markdown, and which uses Git for version control.
336+
documents written in Markdown, which uses Git for version control.
336337
It is possible to connect Wikmd with an online repo.
337338
Written in Python, under MIT license.
338339
+ [Mycorrhiza Wiki](https://mycorrhiza.wiki/) is a free and open-source wiki engine,
@@ -343,7 +344,7 @@ __Git tools and sites__
343344
+ [Gitit](https://github.com/jgm/gitit) is a wiki engine written in Haskell,
344345
that uses [Happstack](http://happstack.com/) (HAppS) for the web server
345346
and [pandoc](http://pandoc.org/) for markup processing (with extended Markdown format as default).
346-
Pages and uploaded files are stored in a git, darcs, or mercurial repository
347+
Pages and uploaded files are stored in a Git, darcs, or Mercurial repository
347348
and may be modified through the wiki's web interface.
348349
Under GPLv2 license.
349350
+ [Xandikos](https://www.xandikos.org/) is a lightweight CardDAV/CalDAV server
@@ -356,7 +357,7 @@ __Git tools and sites__
356357
similar to [GitHub Gist](https://gist.github.com/).
357358
Demo available at <https://demo.opengist.io/>.
358359
Written in Go, under AGPLv3 license.
359-
+ [rgit](https://github.com/w4/rgit) is a gitweb/cgit-like fast web frontend for git repositories.
360+
+ [rgit](https://github.com/w4/rgit) is a gitweb/cgit-like fast web frontend for Git repositories.
360361
You can see it in action at <https://git.inept.dev/>.
361362
Written in Rust using Axum, gitoxide, Askama and RocksDB.
362363
Under WTFPL license
@@ -366,7 +367,7 @@ __Git tools and sites__
366367
Supports syntax highlighting, Markdown + RestructuredText (reST) rendering support,
367368
and code navigation using Exuberant ctags. Can be installed as Docker image of via `pip`.
368369
You can see its demo at <http://klausdemo.lophus.org/>.
369-
Written in Python, under unamed custom permissive license.
370+
Written in Python, under an unnamed custom permissive license.
370371
+ [git-activity](https://git-activity.olets.dev/) is a tool
371372
to record your Git activity across multiple (or all) repos,
372373
and read it optionally filtered by date,
@@ -376,12 +377,12 @@ __Git tools and sites__
376377
Useful for retroactively filling out a time sheet (or correcting a time sheet),
377378
finding that time you solved a problem similar to the one you're working on now, etc.
378379
The log is stored in a plain text file. Source code [on GitHub](https://github.com/olets/git-activity).
379-
Written as bash shell script using AWK, licensed under (custom)
380+
Written as Bash shell script using awk, licensed under (custom)
380381
CC BY-NC-SA 4.0 with Hippocratic License v3 ethical requirements.
381382
+ [git-branches-script](https://github.com/conorsheppard/git-branches-script)
382-
is a convenience script that prints a menu of recent git branches
383+
is a convenience script that prints a menu of recent Git branches
383384
and allows you to switch to a new branch by selecting its corresponding number.
384-
Written as bash shell script, no license provided.
385+
Written as Bash shell script, no license provided.
385386

386387

387388
## Releases

0 commit comments

Comments
 (0)