From 8bf302814e38f314935f582a7ecec8b1f1459e6e Mon Sep 17 00:00:00 2001 From: Markus Jansen Date: Sun, 6 Oct 2024 16:42:20 +0200 Subject: [PATCH 001/227] Really tiny and hopefully last rephrasing. --- _posts/2024-09-30-edition-115.markdown | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/_posts/2024-09-30-edition-115.markdown b/_posts/2024-09-30-edition-115.markdown index 218ca02df..0907ae1d8 100644 --- a/_posts/2024-09-30-edition-115.markdown +++ b/_posts/2024-09-30-edition-115.markdown @@ -330,8 +330,7 @@ __Light reading__ on Avestura's Personal Website. + [My Git cheatsheet](https://write.as/pylapp/my-git-cheatsheet) - a list of some useful commands, as a cheatsheet or a simple reminder to keep and share. - Written by Pierre-Yves Lapersonne, on pylapp blog (in the fediverse (write\.as)), - who posts mainly in French. + Written by Pierre-Yves Lapersonne on his French and English pylapp blog in the fediverse (write\.as). - + +## Developer Spotlight: Chandra Pratap + +_Editor's note: Just like in our previous edition, we return with another + GSoC retrospective interview in this issue. We hope the reflections shared + by GSoC students will provide an insightful perspective that benefits + the community. As always, we welcome your thoughts and feedback!_ + +* Who are you and what do you do? + + Hey! I am Chandra Pratap (prefer going by Chand) and I am an + undergraduate student of Mathematics at SVNIT, Surat, India. I have + a passion for everything computing and like to solve leetcode-styled + problems in my free time or contribute to open-source software. + +* How did you initially become interested in contributing to Git, and + what motivated you to choose it as your GSoC project? + + C was the first programming language that I learnt, and I wanted to + try working on a non-trivial software project. I watched a YouTube + video on open-source and that’s where I got the idea of looking for + open-source projects to contribute to. Git and VLC were the only + open-source C-written software that I was familiar with and used in + day-to-day life, so I decided to start contributing to Git out of the two. + By the time GSoC came around, Git was the only open-source + community that I was familiar with, so I decided to choose it as my + GSoC organization. + +* How do you feel your contribution has impacted the Git community + or the broader open-source ecosystem? + + [My project](https://summerofcode.withgoogle.com/programs/2024/projects/tlh611d7) + was about moving and improving reftable tests, so I think + my contributions made life somewhat easier for other Git hackers, + especially those that frequent the reftable sub-project. My project + didn’t really affect any user-facing aspect of Git, so I don’t think it had + a huge impact on the broader open-source ecosystem, besides the + fact that it gained another lifelong contributor. + +* Is there any aspect of Git that you now see differently after having + contributed to it? + + Everything, to be honest. Working on and with Git for the duration of + my project completely changed my mental model for the tool. Before + GSoC, Git was a clunky tool reserved for software development work + but post-Git, I know the most frequent commands like the back of my + hand, and I’ve already used Git to version control many of my non + software files. I feel like I’ve learnt enough Git to last my entire career. + +* How do you balance your contributions with other responsibilities like + work or school? + + I had summer vacation for the entire duration of GSoC and no other work + commitments, so I had no problems finding time for my GSoC project. + +* Can you share how GSoC helped enhance your technical and non + technical skills (like communication, project management, etc.)? + + In terms of technical skills, I think my C and Git skills saw the biggest jump. + I am a lot more comfortable working with those two tools than when I + was pre-GSoC. Besides that, I’m a lot less scared of the command line + now. In terms of non-technical skills, I believe I’ve gotten a lot better at + composing mails and communicating with other professionals. I’ve learnt + to write with the right amount of professionalism, so I don’t appear too + uptight or too lax, the right way to respond to constructive feedback, how + to time my schedule to fit with others’, especially those living in other + parts of the globe, and how to ask good questions. + +* What was your biggest takeaway or learning from GSoC that you now + apply regularly in your work? + + I’d say the biggest takeaway from GSoC for me was that it is normal for + everyone to face difficulties when trying to learn a new codebase, tool, etc, + or even a different part of the same codebase. It is important to persevere + and not be afraid of asking questions to achieve the desired results. Other + than that, I’ve learnt a lot about good practices in software development, + like appropriately splitting commits and writing good commit messages, + that I subconsciously incorporate in my work now. + +* What was the biggest challenge you faced during your contributions + to Git, and how did you overcome it? + + The biggest challenge in contributing to Git was the initial phase of + getting involved. I remember starting out working on a small patch for + about 2 months with a lot of help from other contributors before it got + accepted into Git’s upstream. After a few initial contributions, I grew more + confident and could steadily find things to work on and produce + acceptable results. The key to overcoming this challenge was to be + persistent and patient, and not being afraid of asking silly questions. + +* Have you thought about mentoring new GSoC students? + + I’m not sure about being a full-on mentor, but I’d love to co-mentor + any future GSoC student(s) interested in working on the reftable + project. + +* If you could get a team of expert developers to work full time on + something in Git for a full year, what would it be? + + The [Git GUI](https://git-scm.com/docs/git-gui) tool. I believe that + would make Git far more accessible than it currently is and get it + incorporated in a lot more people’s day-to-day works. + +* If you could remove something from Git without worrying about + backwards compatibility, what would it be? + + The packed-refs format for refs seems redundant to me now that + reftable is a core part of Git. + +* What is your favourite Git-related tool/library, outside of Git itself? + + [GitGitGadget](https://gitgitgadget.github.io/) was a lifesaver when + I had just started contributing to Git, so that is probably my favourite + Git related tool. + +* What is your toolbox for interacting with the mailing list and for + development of Git? + + I used git’s `send-email` to send patches to the mailing list (especially + the `--compose` and `--annotate` flags) and Gmail’s online client to + convey non-patch mails. For developing Git, I used Vim as the editor + on an Ubuntu machine and Git as the version control software (duh). + +* How do you envision your own involvement with Git or other + open-source projects in the future? + + I plan on making small contributions to Git from time to time, since I + cannot find enough time for larger patches. Other than that, I’ll try to + volunteer as a Git mentor for future GSoC or Outreachy cohorts. + Regarding other open-source projects, I’ll try contributing to them when + I learn a new technology and want a real-world experience. + +* What is your advice for people who want to start Git development? + Where and how should they start? + + Go through Git’s [‘My First Contribution tutorial’](https://git-scm.com/docs/MyFirstContribution) + for the initial setup and to get an idea of what’s it like + to work on Git. Then work on a few ‘microprojects’ ([more information on + the Git Developer's website](https://git.github.io/General-Microproject-Information/) ) + to dip your toes in the Git Development community. From there, you + can figure out interesting stuff to work on by yourself. + +* Would you recommend other students or contributors to participate in + the GSoC, or other mentoring programs, working on Git? Why? Do you + have advice for them? + + Yes. I believe that Git is a tool that every working professional can find + useful regardless of whether they work in the software industry or not + and working on Git through an open-source program is an excellent way + to get good at it in a short period of time. There’s also the added benefit + of joining a large and active community of amazingly experienced + developers who can teach you a lot about writing software, and the + software development workflow in general. + + I think the key to getting selected as a participant in GSoC or other + mentoring programs is getting involved as early as possible. The more + time you allow yourself to get familiar with Git’s codebase and + development workflow, the easier it becomes to find an apt project and + write a reasonable proposal for it. Also, the initial phase of contributions is + the most difficult part of getting involved with an open-source project, so it + is better to allow yourself ample time to tackle that initial hurdle. + ## Other News From a70c46b646bcfa4dba16a9beb2605c4fbe7ab2ce Mon Sep 17 00:00:00 2001 From: Brooke Kuhlmann Date: Tue, 15 Oct 2024 12:53:59 -0600 Subject: [PATCH 014/227] Added Git For Each Ref article link This article details how to use `git for-each-ref` in new and interesting ways (including the new `is-base` field). --- rev_news/drafts/edition-116.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rev_news/drafts/edition-116.md b/rev_news/drafts/edition-116.md index 4dce659e6..559d98f6a 100644 --- a/rev_news/drafts/edition-116.md +++ b/rev_news/drafts/edition-116.md @@ -40,6 +40,9 @@ __Various__ __Light reading__ ++ [Git For Each Ref](https://alchemists.io/articles/git_for_each_ref) by Brooke Kuhlmann. Learn how + to use this command to make use of references for information dumping, statistcs, and much more. Included in this article is use of the new `is-base` field name recently added in link:https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.47.0.txt[Git 2.47.0]. + From 40b3b5158983e26f82a3bdfdf2d0edbe1ae4ca37 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sun, 27 Oct 2024 04:27:19 +0100 Subject: [PATCH 015/227] rn-116: add releases --- rev_news/drafts/edition-116.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/rev_news/drafts/edition-116.md b/rev_news/drafts/edition-116.md index 3ab275b48..204956278 100644 --- a/rev_news/drafts/edition-116.md +++ b/rev_news/drafts/edition-116.md @@ -208,6 +208,31 @@ __Git tools and sites__ ## Releases ++ Git [2.47.0](https://public-inbox.org/git/xmqqa5fg9bsz.fsf@gitster.g/), +[2.47.0-rc1](https://public-inbox.org/git/xmqqploiphj3.fsf@gitster.g/) ++ Git for Windows [2.47.0(2)](https://github.com/git-for-windows/git/releases/tag/v2.47.0.windows.2), +[2.47.0(1)](https://github.com/git-for-windows/git/releases/tag/v2.47.0.windows.1), +[2.47.0-rc1(1)](https://github.com/git-for-windows/git/releases/tag/v2.47.0-rc1.windows.1) ++ libgit2 [1.8.3](https://github.com/libgit2/libgit2/releases/tag/v1.8.3) ++ GitLab [17.5.1, 17.4.3, 17.3.6](https://about.gitlab.com/releases/2024/10/23/patch-release-gitlab-17-5-1-released/) +[17.5](https://about.gitlab.com/releases/2024/10/17/gitlab-17-5-released/), +[17.4.2, 17.3.5, 17.2.9](https://about.gitlab.com/releases/2024/10/09/patch-release-gitlab-17-4-2-released/) ++ Gerrit Code Review [3.10.2](https://www.gerritcodereview.com/3.10.html#3102), +[3.8.9](https://www.gerritcodereview.com/3.8.html#389), +[3.9.7](https://www.gerritcodereview.com/3.9.html#397) ++ GitHub Enterprise [3.14.2](https://help.github.com/enterprise-server@3.14/admin/release-notes#3.14.2), +[3.13.5](https://help.github.com/enterprise-server@3.13/admin/release-notes#3.13.5), +[3.12.10](https://help.github.com/enterprise-server@3.12/admin/release-notes#3.12.10), +[3.11.16](https://help.github.com/enterprise-server@3.11/admin/release-notes#3.11.16) ++ GitKraken [10.4.1](https://help.gitkraken.com/gitkraken-client/current/), +[10.4.0](https://help.gitkraken.com/gitkraken-client/current/) ++ GitHub Desktop [3.4.8](https://desktop.github.com/release-notes/), +[3.4.7](https://desktop.github.com/release-notes/), +[3.4.6](https://desktop.github.com/release-notes/) ++ Garden [1.9.0](https://github.com/garden-rs/garden/releases/tag/v1.9.0), +[1.8.0](https://github.com/garden-rs/garden/releases/tag/v1.8.0) ++ GitButler [0.13.7](https://github.com/gitbutlerapp/gitbutler/releases/tag/release/0.13.7), +[0.13.6](https://github.com/gitbutlerapp/gitbutler/releases/tag/release/0.13.6) ## Credits From 768ab37a2d9a99dc164677df59089fa225021646 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 30 Oct 2024 21:05:00 +0100 Subject: [PATCH 016/227] rn-116: add Git and 'grep -q' article --- rev_news/drafts/edition-116.md | 69 +++++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 2 deletions(-) diff --git a/rev_news/drafts/edition-116.md b/rev_news/drafts/edition-116.md index 204956278..b8b43c135 100644 --- a/rev_news/drafts/edition-116.md +++ b/rev_news/drafts/edition-116.md @@ -25,10 +25,75 @@ This edition covers what happened during the months of September 2024 and Octobe ### Reviews --> - +* [fatal from submodule status --recursive when used with grep -q](https://lore.kernel.org/git/CAKDm0rNaHbzoiPg=DeuCoxzooNAsxw2BJfc0wg7fC_-=o9uJ7w@mail.gmail.com/) + + Matt Liberty reported that when he tried using + `git submodule status --recursive | grep -q "^+"` on a repo with + a submodule, he got an error message like "fatal: failed to recurse + into submodule XXX", where XXX is the name of the submodule. + + He expected no error message, no output and a 0 exit code from the + whole command line as it should have succeeded. He guessed that Git + didn't like that `grep` when used with `-q` exits immediately + (without printing anything) when there is a match. + + Phillip Wood replied to Matt saying he assumed that `grep`'s exit + broke the pipe between `git` and `grep`, so `git` received a + 'SIGPIPE' signal which killed it. Phillip suggested consuming the + whole output from Git if the exit code from it was wanted. + + Matt replied to Phillip that he was interested in the exit code from + `grep` not from `git` and that Git shouldn't output any error when + its output is connected to a pipe that gets broken, in the same way + as the `yes` command, for example, doesn't output any error when + piped to `grep -q y`. + + Junio Hamano, the Git maintainer, also replied to Phillip's first + message that the error Git emitted in such a case wasn't useful to + the user. + + Matt replied to Junio that he thought no error at all should be + emitted as most Unix tools don't output any error. + + Then Phillip replied to Matt's first reply to him. He asked if all + Matt wanted was that `git submodule status` did not print any error + message when it receives a SIGPIPE signal. Matt replied that he + wanted both no error message and a 0 exit code from it. + + Junio replied to Matt that it was reasonable to ask for no error + message, but it should be OK if the exit code was related to the + SIGPIPE message that the Git command received and that killed + it. Junio used the example that even `yes` exited with code 130 when + killed using the Control-C keys on a terminal. + + The exit code associated with a signal is '128 + the signal number', + for example as the Control-C keys send a SIGINT signal, which signal + number is 2, processes killed this way should exit with code '128 + 2', + so 130. + + Eric Sunshine replied to Junio that it wasn't clear how the exit + code from Git was important in the discussion as in the original + command line, Git appears before the pipe, so its exit code might be + lost. + + Matt replied to Eric that the exit code mattered if the `pipefail` + shell option was used. + + Phillip replied to Matt suggesting he remap the exit code + associated with SIGPIPE, which is 141 (128 + 13) to 0, if he was + using `pipefail` but still wanted a 0 exit code. Phillip also gave + an example shell function to help with that remapping, and sent + [a first version of a patch](https://lore.kernel.org/git/pull.1799.git.1726837642511.gitgitgadget@gmail.com/) + to fix the error message. + + Junio reviewed that patch and found that it was unnecessarily + including the "signal.h" system header. + + Phillip fixed that issue in + [version 2 of the patch](https://lore.kernel.org/git/pull.1799.v2.git.1726925150113.gitgitgadget@gmail.com/) + which was merged and part of Git v2.47.0. ## Developer Spotlight: Chandra Pratap From 079a323e4a7592c720ae7f0b078420cfdd8e80e1 Mon Sep 17 00:00:00 2001 From: Markus Jansen Date: Fri, 1 Nov 2024 00:09:05 +0100 Subject: [PATCH 017/227] Supplied a really tiny amount of spelling and formatting corrections. --- rev_news/drafts/edition-116.md | 42 +++++++++++++++++----------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/rev_news/drafts/edition-116.md b/rev_news/drafts/edition-116.md index b8b43c135..c9ed5a216 100644 --- a/rev_news/drafts/edition-116.md +++ b/rev_news/drafts/edition-116.md @@ -13,7 +13,7 @@ Welcome to the 116th edition of [Git Rev News](https://git.github.io/rev_news/re a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to subscribe, see [the Git Rev News page](https://git.github.io/rev_news/rev_news/) on [git.github.io](http://git.github.io). -This edition covers what happened during the months of September 2024 and October 2024. +This edition covers what happened during the months of September and October 2024. ## Discussions @@ -27,7 +27,7 @@ This edition covers what happened during the months of September 2024 and Octobe ### Support -* [fatal from submodule status --recursive when used with grep -q](https://lore.kernel.org/git/CAKDm0rNaHbzoiPg=DeuCoxzooNAsxw2BJfc0wg7fC_-=o9uJ7w@mail.gmail.com/) +* [fatal from `submodule status --recursive` when used with `grep -q`](https://lore.kernel.org/git/CAKDm0rNaHbzoiPg=DeuCoxzooNAsxw2BJfc0wg7fC_-=o9uJ7w@mail.gmail.com/) Matt Liberty reported that when he tried using `git submodule status --recursive | grep -q "^+"` on a repo with @@ -41,11 +41,11 @@ This edition covers what happened during the months of September 2024 and Octobe Phillip Wood replied to Matt saying he assumed that `grep`'s exit broke the pipe between `git` and `grep`, so `git` received a - 'SIGPIPE' signal which killed it. Phillip suggested consuming the + `SIGPIPE` signal which killed it. Phillip suggested consuming the whole output from Git if the exit code from it was wanted. Matt replied to Phillip that he was interested in the exit code from - `grep` not from `git` and that Git shouldn't output any error when + `grep`, not from `git`, and that Git shouldn't output any error when its output is connected to a pipe that gets broken, in the same way as the `yes` command, for example, doesn't output any error when piped to `grep -q y`. @@ -59,17 +59,17 @@ This edition covers what happened during the months of September 2024 and Octobe Then Phillip replied to Matt's first reply to him. He asked if all Matt wanted was that `git submodule status` did not print any error - message when it receives a SIGPIPE signal. Matt replied that he + message when it receives a `SIGPIPE` signal. Matt replied that he wanted both no error message and a 0 exit code from it. Junio replied to Matt that it was reasonable to ask for no error message, but it should be OK if the exit code was related to the - SIGPIPE message that the Git command received and that killed + `SIGPIPE` message that the Git command received and that killed it. Junio used the example that even `yes` exited with code 130 when killed using the Control-C keys on a terminal. The exit code associated with a signal is '128 + the signal number', - for example as the Control-C keys send a SIGINT signal, which signal + for example as the Control-C keys send a `SIGINT` signal, which signal number is 2, processes killed this way should exit with code '128 + 2', so 130. @@ -82,7 +82,7 @@ This edition covers what happened during the months of September 2024 and Octobe shell option was used. Phillip replied to Matt suggesting he remap the exit code - associated with SIGPIPE, which is 141 (128 + 13) to 0, if he was + associated with `SIGPIPE`, which is 141 (128 + 13), to 0, if he was using `pipefail` but still wanted a 0 exit code. Phillip also gave an example shell function to help with that remapping, and sent [a first version of a patch](https://lore.kernel.org/git/pull.1799.git.1726837642511.gitgitgadget@gmail.com/) @@ -114,23 +114,23 @@ _Editor's note: Just like in our previous edition, we return with another C was the first programming language that I learnt, and I wanted to try working on a non-trivial software project. I watched a YouTube - video on open-source and that’s where I got the idea of looking for + video on open source and that’s where I got the idea of looking for open-source projects to contribute to. Git and VLC were the only open-source C-written software that I was familiar with and used in day-to-day life, so I decided to start contributing to Git out of the two. - By the time GSoC came around, Git was the only open-source + By the time GSoC came around, Git was the only open source community that I was familiar with, so I decided to choose it as my GSoC organization. * How do you feel your contribution has impacted the Git community - or the broader open-source ecosystem? + or the broader open source ecosystem? [My project](https://summerofcode.withgoogle.com/programs/2024/projects/tlh611d7) was about moving and improving reftable tests, so I think my contributions made life somewhat easier for other Git hackers, - especially those that frequent the reftable sub-project. My project + especially those who frequent the reftable sub-project. My project didn’t really affect any user-facing aspect of Git, so I don’t think it had - a huge impact on the broader open-source ecosystem, besides the + a huge impact on the broader open source ecosystem, besides the fact that it gained another lifelong contributor. * Is there any aspect of Git that you now see differently after having @@ -140,8 +140,8 @@ _Editor's note: Just like in our previous edition, we return with another my project completely changed my mental model for the tool. Before GSoC, Git was a clunky tool reserved for software development work but post-Git, I know the most frequent commands like the back of my - hand, and I’ve already used Git to version control many of my non - software files. I feel like I’ve learnt enough Git to last my entire career. + hand, and I’ve already used Git to version control many of my non-software + files. I feel like I’ve learnt enough Git to last my entire career. * How do you balance your contributions with other responsibilities like work or school? @@ -149,8 +149,8 @@ _Editor's note: Just like in our previous edition, we return with another I had summer vacation for the entire duration of GSoC and no other work commitments, so I had no problems finding time for my GSoC project. -* Can you share how GSoC helped enhance your technical and non - technical skills (like communication, project management, etc.)? +* Can you share how GSoC helped enhance your technical and non-technical + skills (like communication, project management, etc.)? In terms of technical skills, I think my C and Git skills saw the biggest jump. I am a lot more comfortable working with those two tools than when I @@ -195,7 +195,7 @@ _Editor's note: Just like in our previous edition, we return with another The [Git GUI](https://git-scm.com/docs/git-gui) tool. I believe that would make Git far more accessible than it currently is and get it - incorporated in a lot more people’s day-to-day works. + incorporated in a lot more peoples’ day-to-day works. * If you could remove something from Git without worrying about backwards compatibility, what would it be? @@ -212,7 +212,7 @@ _Editor's note: Just like in our previous edition, we return with another * What is your toolbox for interacting with the mailing list and for development of Git? - I used git’s `send-email` to send patches to the mailing list (especially + I used Git’s `send-email` to send patches to the mailing list (especially the `--compose` and `--annotate` flags) and Gmail’s online client to convey non-patch mails. For developing Git, I used Vim as the editor on an Ubuntu machine and Git as the version control software (duh). @@ -232,7 +232,7 @@ _Editor's note: Just like in our previous edition, we return with another Go through Git’s [‘My First Contribution tutorial’](https://git-scm.com/docs/MyFirstContribution) for the initial setup and to get an idea of what’s it like to work on Git. Then work on a few ‘microprojects’ ([more information on - the Git Developer's website](https://git.github.io/General-Microproject-Information/) ) + the Git Developer's website](https://git.github.io/General-Microproject-Information/)) to dip your toes in the Git Development community. From there, you can figure out interesting stuff to work on by yourself. @@ -241,7 +241,7 @@ _Editor's note: Just like in our previous edition, we return with another have advice for them? Yes. I believe that Git is a tool that every working professional can find - useful regardless of whether they work in the software industry or not + useful regardless of whether they work in the software industry or not, and working on Git through an open-source program is an excellent way to get good at it in a short period of time. There’s also the added benefit of joining a large and active community of amazingly experienced From c9d310293c0da44806b4e64cc33a83f52caedbc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Nar=C4=99bski?= Date: Fri, 1 Nov 2024 05:07:14 +0100 Subject: [PATCH 018/227] rn-116: Add links to various news, articles, sites, and tools --- rev_news/drafts/edition-116.md | 80 +++++++++++++++++++++++++++++++++- 1 file changed, 79 insertions(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-116.md b/rev_news/drafts/edition-116.md index c9ed5a216..0bb86d2fb 100644 --- a/rev_news/drafts/edition-116.md +++ b/rev_news/drafts/edition-116.md @@ -95,6 +95,7 @@ This edition covers what happened during the months of September and October 202 [version 2 of the patch](https://lore.kernel.org/git/pull.1799.v2.git.1726925150113.gitgitgadget@gmail.com/) which was merged and part of Git v2.47.0. + ## Developer Spotlight: Chandra Pratap _Editor's note: Just like in our previous edition, we return with another @@ -260,16 +261,93 @@ _Editor's note: Just like in our previous edition, we return with another ## Other News __Various__ ++ [Highlights from Git 2.47](https://github.blog/open-source/git/highlights-from-git-2-47/) + by Taylor Blau on GitHub Blog. Those include features like incremental multi-pack indexes, + `%(is-base:)` atom for `git for-each-ref`, + “[Platform Support Policy](https://github.com/git/git/blob/v2.47.0/Documentation/technical/platform-support.txt)” document, + `git mergetool` directly supporting Visual Studio Code merge tool, and others. ++ [What's new in Git 2.47.0?](https://about.gitlab.com/blog/2024/10/07/whats-new-in-git-2-47-0/) + by Justin Tobler on GitLab Blog. Highlights include + `init.defaultRefFormat` configuration option that can be set to use `reftable` backend + (see [Beginner's guide to the Git reftable format](https://about.gitlab.com/blog/2024/05/30/a-beginners-guide-to-the-git-reftable-format/)), + `init.defaultObjectFormat` configuration option that can be set to `sha256`, + `git refs verify`, and others. ++ Tower is running [Git GUIs User's Survey](https://gittower.typeform.com/git-survey) + for people who do not 100% of the time use Git in the terminal. __Light reading__ ++ [How Typefully Uses Tower [Git GUI Client] to Conquer Social Media Publishing](https://www.git-tower.com/blog/how-typefully-uses-tower) + by Bruno Brito on Tower Blog. ++ [Moving all our Python code to a monorepo: pytendi](https://attendi.nl/moving-all-our-python-code-to-a-monorepo-pytendi/). ++ [Bruno — An API Client Using Git to Fight for Developer Experience](https://www.git-tower.com/blog/bruno-api-client-using-git/) + by Ryan Reynolds on Tower Blog. ++ [Using Git as Your Personal To-Do List](https://dev.to/munemprionto/using-git-as-your-personal-to-do-list-3kkd) + by Munem Prionto on DEV\.to - more as a way of learning Git by the way of managing + a TODO list, rather than for practical reasons. + + Contrast with [Using Git to Manage Todos](https://jezenthomas.com/2015/10/using-git-to-manage-todos/ + by Jezen Thomas (2015), mentioned in [Git Rev News Edition #](https://git.github.io/rev_news/2015/11/11/edition-9/), + which is about using Git to help manage TODO or FIXME comments in the codebase + (assuming that for example your IDE does not have plugin for managing TODOs). + + One can also consider using a CLI tool that stores data in plain text files + for managing TODOs, like [Taskwarrior](https://taskwarrior.org/). Plain text + files work well with Git. + ++ [Python PGP proposal poses packaging puzzles](https://lwn.net/Articles/993787/) + by Joe Brockmeier on LWN\.net - [Sigstore](https://docs.sigstore.dev/) vs [OpenPGP](https://www.openpgp.org/). + Sigstore was mentioned in [Git Rev News Edition #91](https://git.github.io/rev_news/2022/09/30/edition-91/) + and [#111](https://git.github.io/rev_news/2024/05/31/edition-111/). ++ [A look at the aerc mail client](https://lwn.net/Articles/993498/) + by Joe Brockmeier on LWN\.net. -__Git tools and sites__ +__Scientific papers__ ++ Tsukasa Yagi, Shinpei Hayashi: _"Toward Interactive Optimization of Source Code Differences: + An Empirical Study of Its Performance"_, + [arXiv:2409.13590]((https://arxiv.org/abs/2409.13590)), + with dataset at (but no source code). + + based on a prior study: + Nugroho, et al.: _"How different are different diff algorithms in Git?: + Use --histogram for code changes"_ (2019), + +__Git tools and sites__ ++ [Reviewing git contributions via email](https://git-am.io/) () + is a companion piece to [interactive guide on sending patches with git send-email](https://git-send-email.io/) + () - which guide was mentioned in + [Git Rev News Edition #50](https://git.github.io/rev_news/2019/04/26/edition-50/) + [#68](https://git.github.io/rev_news/2020/10/30/edition-68/), and + [#92](https://git.github.io/rev_news/2022/10/26/edition-92/). ++ ["Data Management" section of Awesome MLOps](https://github.com/kelvins/awesome-mlops#data-management) + include also tools related to versioning data like + + [Dolt](https://github.com/dolthub/dolt) ([Git Rev News #62](https://git.github.io/rev_news/2020/04/23/edition-62/)), + + [DVC](https://dvc.org/) (first mentioned in [Git Rev News #42](https://git.github.io/rev_news/2018/08/22/edition-42/), + then in [#63](https://git.github.io/rev_news/2020/05/28/edition-63/), + [#64](https://git.github.io/rev_news/2020/06/25/edition-64/), + [#100](https://git.github.io/rev_news/2023/06/30/edition-100/), + [#107](https://git.github.io/rev_news/2024/01/31/edition-107/), and + [#113](https://git.github.io/rev_news/2024/07/31/edition-113/), + among others), + + [Dud](https://kevin-hanselman.github.io/dud/), improving on DVC, but with narrowed scope, + + [Intake](https://intake.readthedocs.io/) ([Git Rev News #96](https://git.github.io/rev_news/2023/02/28/edition-96/)), + + See also the discussion in issue #337 in Intake repository: + [Data versioning/validation: Comparing Intake with DVC, Quilt and Great Expectations](https://github.com/intake/intake/issues/337) + + [lakeFS](https://lakefs.io/) ([Git Rev News #78](https://git.github.io/rev_news/2021/08/31/edition-78/)), + + [Quilt](https://www.quiltdata.com/) / [Quilt Data](https://www.quiltdata.com/) + ([Git Rev News #99](https://git.github.io/rev_news/2023/05/31/edition-99/)). ++ [git-task](https://github.com/jhspetersson/git-task) is + a local-first task manager/bug tracker that stores everything within your git repository, + and which can sync issues to/from GitHub or GitLab. + Written in Rust, under MIT license. ++ [Bruno](https://www.usebruno.com/) is fast and Git-friendly opensource API client, + similar to Postman, Insomnia and similar tools. It stores collections directly + in a folder on your filesystem, in a plain text markup language, Bru. + + Compare with [Simple Web Application Test (SWAT)](https://github.com/melezhik/swat), + web application oriented testing framework, with test plan stored as plain text files + in specially named directories. ## Releases From 3dbc00f1ce193db3aa254a8f051f4d6e46b0c220 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20N=C4=9Bmec?= Date: Fri, 1 Nov 2024 08:51:42 +0100 Subject: [PATCH 019/227] rn-116: minor copy edit I'm also overriding some previous edits, so perhaps some explanation is in order: 1. 079a323e4a75 changed some 'open-source' to 'open source', but not all and not consistently. Standard English uses dashed forms for adjectives and non-dashed forms for nouns; follow that rule. 2. 079a323e4a75 changed "people's" to "peoples'", which is not correct here (it would imply a number of ethnic groups is meant, but that's not the case); restore the original. (As an aside, personally I tend to leave the interviews alone beyond obvious typos, as I consider the language idiosyncrasies part of the glimpse into an interviewee's personality.) --- rev_news/drafts/edition-116.md | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/rev_news/drafts/edition-116.md b/rev_news/drafts/edition-116.md index 0bb86d2fb..ef90b3011 100644 --- a/rev_news/drafts/edition-116.md +++ b/rev_news/drafts/edition-116.md @@ -69,7 +69,7 @@ This edition covers what happened during the months of September and October 202 killed using the Control-C keys on a terminal. The exit code associated with a signal is '128 + the signal number', - for example as the Control-C keys send a `SIGINT` signal, which signal + for example as the Control-C keys send a `SIGINT` signal, whose signal number is 2, processes killed this way should exit with code '128 + 2', so 130. @@ -119,19 +119,19 @@ _Editor's note: Just like in our previous edition, we return with another open-source projects to contribute to. Git and VLC were the only open-source C-written software that I was familiar with and used in day-to-day life, so I decided to start contributing to Git out of the two. - By the time GSoC came around, Git was the only open source + By the time GSoC came around, Git was the only open-source community that I was familiar with, so I decided to choose it as my GSoC organization. * How do you feel your contribution has impacted the Git community - or the broader open source ecosystem? + or the broader open-source ecosystem? [My project](https://summerofcode.withgoogle.com/programs/2024/projects/tlh611d7) was about moving and improving reftable tests, so I think my contributions made life somewhat easier for other Git hackers, especially those who frequent the reftable sub-project. My project didn’t really affect any user-facing aspect of Git, so I don’t think it had - a huge impact on the broader open source ecosystem, besides the + a huge impact on the broader open-source ecosystem, besides the fact that it gained another lifelong contributor. * Is there any aspect of Git that you now see differently after having @@ -196,7 +196,7 @@ _Editor's note: Just like in our previous edition, we return with another The [Git GUI](https://git-scm.com/docs/git-gui) tool. I believe that would make Git far more accessible than it currently is and get it - incorporated in a lot more peoples’ day-to-day works. + incorporated in a lot more people’s day-to-day works. * If you could remove something from Git without worrying about backwards compatibility, what would it be? @@ -262,7 +262,7 @@ _Editor's note: Just like in our previous edition, we return with another __Various__ + [Highlights from Git 2.47](https://github.blog/open-source/git/highlights-from-git-2-47/) - by Taylor Blau on GitHub Blog. Those include features like incremental multi-pack indexes, + by Taylor Blau on GitHub Blog. Includes features like incremental multi-pack indexes, `%(is-base:)` atom for `git for-each-ref`, “[Platform Support Policy](https://github.com/git/git/blob/v2.47.0/Documentation/technical/platform-support.txt)” document, `git mergetool` directly supporting Visual Studio Code merge tool, and others. @@ -272,7 +272,7 @@ __Various__ (see [Beginner's guide to the Git reftable format](https://about.gitlab.com/blog/2024/05/30/a-beginners-guide-to-the-git-reftable-format/)), `init.defaultObjectFormat` configuration option that can be set to `sha256`, `git refs verify`, and others. -+ Tower is running [Git GUIs User's Survey](https://gittower.typeform.com/git-survey) ++ Tower is running a [Git GUIs User's Survey](https://gittower.typeform.com/git-survey) for people who do not 100% of the time use Git in the terminal. @@ -288,7 +288,7 @@ __Light reading__ + Contrast with [Using Git to Manage Todos](https://jezenthomas.com/2015/10/using-git-to-manage-todos/ by Jezen Thomas (2015), mentioned in [Git Rev News Edition #](https://git.github.io/rev_news/2015/11/11/edition-9/), which is about using Git to help manage TODO or FIXME comments in the codebase - (assuming that for example your IDE does not have plugin for managing TODOs). + (assuming that for example your IDE does not have a plugin for managing TODOs). + One can also consider using a CLI tool that stores data in plain text files for managing TODOs, like [Taskwarrior](https://taskwarrior.org/). Plain text files work well with Git. @@ -317,12 +317,12 @@ __Scientific papers__ __Git tools and sites__ + [Reviewing git contributions via email](https://git-am.io/) () is a companion piece to [interactive guide on sending patches with git send-email](https://git-send-email.io/) - () - which guide was mentioned in + (); the latter was mentioned in [Git Rev News Edition #50](https://git.github.io/rev_news/2019/04/26/edition-50/) [#68](https://git.github.io/rev_news/2020/10/30/edition-68/), and [#92](https://git.github.io/rev_news/2022/10/26/edition-92/). + ["Data Management" section of Awesome MLOps](https://github.com/kelvins/awesome-mlops#data-management) - include also tools related to versioning data like + also includes tools related to versioning data like + [Dolt](https://github.com/dolthub/dolt) ([Git Rev News #62](https://git.github.io/rev_news/2020/04/23/edition-62/)), + [DVC](https://dvc.org/) (first mentioned in [Git Rev News #42](https://git.github.io/rev_news/2018/08/22/edition-42/), then in [#63](https://git.github.io/rev_news/2020/05/28/edition-63/), @@ -333,7 +333,7 @@ __Git tools and sites__ among others), + [Dud](https://kevin-hanselman.github.io/dud/), improving on DVC, but with narrowed scope, + [Intake](https://intake.readthedocs.io/) ([Git Rev News #96](https://git.github.io/rev_news/2023/02/28/edition-96/)), - + See also the discussion in issue #337 in Intake repository: + + See also the discussion in issue #337 in the Intake repository: [Data versioning/validation: Comparing Intake with DVC, Quilt and Great Expectations](https://github.com/intake/intake/issues/337) + [lakeFS](https://lakefs.io/) ([Git Rev News #78](https://git.github.io/rev_news/2021/08/31/edition-78/)), + [Quilt](https://www.quiltdata.com/) / [Quilt Data](https://www.quiltdata.com/) @@ -342,9 +342,9 @@ __Git tools and sites__ a local-first task manager/bug tracker that stores everything within your git repository, and which can sync issues to/from GitHub or GitLab. Written in Rust, under MIT license. -+ [Bruno](https://www.usebruno.com/) is fast and Git-friendly opensource API client, ++ [Bruno](https://www.usebruno.com/) is a fast and Git-friendly open-source API client, similar to Postman, Insomnia and similar tools. It stores collections directly - in a folder on your filesystem, in a plain text markup language, Bru. + in a folder on your filesystem in a plain text markup language, Bru. + Compare with [Simple Web Application Test (SWAT)](https://github.com/melezhik/swat), web application oriented testing framework, with test plan stored as plain text files in specially named directories. @@ -357,7 +357,7 @@ __Git tools and sites__ [2.47.0(1)](https://github.com/git-for-windows/git/releases/tag/v2.47.0.windows.1), [2.47.0-rc1(1)](https://github.com/git-for-windows/git/releases/tag/v2.47.0-rc1.windows.1) + libgit2 [1.8.3](https://github.com/libgit2/libgit2/releases/tag/v1.8.3) -+ GitLab [17.5.1, 17.4.3, 17.3.6](https://about.gitlab.com/releases/2024/10/23/patch-release-gitlab-17-5-1-released/) ++ GitLab [17.5.1, 17.4.3, 17.3.6](https://about.gitlab.com/releases/2024/10/23/patch-release-gitlab-17-5-1-released/), [17.5](https://about.gitlab.com/releases/2024/10/17/gitlab-17-5-released/), [17.4.2, 17.3.5, 17.2.9](https://about.gitlab.com/releases/2024/10/09/patch-release-gitlab-17-4-2-released/) + Gerrit Code Review [3.10.2](https://www.gerritcodereview.com/3.10.html#3102), From 516e6661b69e73b734f1815a9396898fffa6b519 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Nar=C4=99bski?= Date: Fri, 1 Nov 2024 09:50:10 +0100 Subject: [PATCH 020/227] rn-116: Minuscule fixes --- rev_news/drafts/edition-116.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rev_news/drafts/edition-116.md b/rev_news/drafts/edition-116.md index 0bb86d2fb..e46b85a03 100644 --- a/rev_news/drafts/edition-116.md +++ b/rev_news/drafts/edition-116.md @@ -263,7 +263,7 @@ _Editor's note: Just like in our previous edition, we return with another __Various__ + [Highlights from Git 2.47](https://github.blog/open-source/git/highlights-from-git-2-47/) by Taylor Blau on GitHub Blog. Those include features like incremental multi-pack indexes, - `%(is-base:)` atom for `git for-each-ref`, + `%(is-base:)` atom for `git for-each-ref`, “[Platform Support Policy](https://github.com/git/git/blob/v2.47.0/Documentation/technical/platform-support.txt)” document, `git mergetool` directly supporting Visual Studio Code merge tool, and others. + [What's new in Git 2.47.0?](https://about.gitlab.com/blog/2024/10/07/whats-new-in-git-2-47-0/) @@ -286,7 +286,7 @@ __Light reading__ by Munem Prionto on DEV\.to - more as a way of learning Git by the way of managing a TODO list, rather than for practical reasons. + Contrast with [Using Git to Manage Todos](https://jezenthomas.com/2015/10/using-git-to-manage-todos/ - by Jezen Thomas (2015), mentioned in [Git Rev News Edition #](https://git.github.io/rev_news/2015/11/11/edition-9/), + by Jezen Thomas (2015), mentioned in [Git Rev News Edition #9](https://git.github.io/rev_news/2015/11/11/edition-9/), which is about using Git to help manage TODO or FIXME comments in the codebase (assuming that for example your IDE does not have plugin for managing TODOs). + One can also consider using a CLI tool that stores data in plain text files @@ -309,9 +309,9 @@ __Scientific papers__ An Empirical Study of Its Performance"_, [arXiv:2409.13590]((https://arxiv.org/abs/2409.13590)), with dataset at (but no source code). - + based on a prior study: + + based on a prior study: Nugroho, et al.: _"How different are different diff algorithms in Git?: - Use --histogram for code changes"_ (2019), + Use --histogram for code changes"_ (2019), __Git tools and sites__ From 8dd990507fe1b7b8d6de889fdba4ad62e8ec0b62 Mon Sep 17 00:00:00 2001 From: Markus Jansen Date: Fri, 1 Nov 2024 17:37:49 +0100 Subject: [PATCH 021/227] Removed a solitary boldface mark for "Git". --- rev_news/drafts/edition-116.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-116.md b/rev_news/drafts/edition-116.md index 6ed2ff70a..c2ff9d44d 100644 --- a/rev_news/drafts/edition-116.md +++ b/rev_news/drafts/edition-116.md @@ -342,7 +342,7 @@ __Git tools and sites__ a local-first task manager/bug tracker that stores everything within your git repository, and which can sync issues to/from GitHub or GitLab. Written in Rust, under MIT license. -+ [Bruno](https://www.usebruno.com/) is a fast and Git-friendly open-source API client, ++ [Bruno](https://www.usebruno.com/) is a fast and Git-friendly open-source API client, similar to Postman, Insomnia and similar tools. It stores collections directly in a folder on your filesystem in a plain text markup language, Bru. + Compare with [Simple Web Application Test (SWAT)](https://github.com/melezhik/swat), From f17eb03e5eda55588913f77c004714a070d1b441 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 1 Nov 2024 21:42:07 +0100 Subject: [PATCH 022/227] rn-116: add links suggested by Brandon Pugh --- rev_news/drafts/edition-116.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/rev_news/drafts/edition-116.md b/rev_news/drafts/edition-116.md index d656a1366..ccd7eeca8 100644 --- a/rev_news/drafts/edition-116.md +++ b/rev_news/drafts/edition-116.md @@ -303,6 +303,13 @@ __Light reading__ + [Git For Each Ref](https://alchemists.io/articles/git_for_each_ref) by Brooke Kuhlmann. Learn how to use this command to make use of references for information dumping, statistcs, and much more. Included in this article is use of the new `is-base` field name recently added in link:https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.47.0.txt[Git 2.47.0]. ++ [Searching for and navigating Git commits](https://alexharri.com/blog/searching-and-navigating-git-commits) + by Alex Harri. ++ [Why some of us like "interdiff" code review](https://gist.github.com/thoughtpolice/9c45287550a56b2047c6311fbadebed2) + by Austin Seipp. ++ [How I Review GitHub PRs](https://www.bitquabit.com/post/how-i-do-github-prs/) + by Benjamin Pollack. + From 36a0dea4bcdc4e851d9790b351989cc0359d23df Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 1 Nov 2024 21:42:53 +0100 Subject: [PATCH 023/227] rn-116: add Brandon Pugh among the helpers --- rev_news/drafts/edition-116.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-116.md b/rev_news/drafts/edition-116.md index ccd7eeca8..c2cdc8c66 100644 --- a/rev_news/drafts/edition-116.md +++ b/rev_news/drafts/edition-116.md @@ -394,4 +394,4 @@ Christian Couder <>, Jakub Narębski <>, Markus Jansen <> and Kaartic Sivaraam <> -with help from XXX. +with help from Brandon Pugh. From 76a8ce4b57822ee94c357e29bc5417af2dba52a8 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 1 Nov 2024 21:43:46 +0100 Subject: [PATCH 024/227] rn-116: add Chandra Pratap among the helpers --- rev_news/drafts/edition-116.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-116.md b/rev_news/drafts/edition-116.md index c2cdc8c66..57b86bf0a 100644 --- a/rev_news/drafts/edition-116.md +++ b/rev_news/drafts/edition-116.md @@ -394,4 +394,4 @@ Christian Couder <>, Jakub Narębski <>, Markus Jansen <> and Kaartic Sivaraam <> -with help from Brandon Pugh. +with help from Chandra Pratap and Brandon Pugh. From ca35c815bbd529341b3686b01254142249b513e0 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 1 Nov 2024 21:50:09 +0100 Subject: [PATCH 025/227] rn-116: add Brooke Kuhlmann among the helpers --- rev_news/drafts/edition-116.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-116.md b/rev_news/drafts/edition-116.md index 57b86bf0a..7daadf60f 100644 --- a/rev_news/drafts/edition-116.md +++ b/rev_news/drafts/edition-116.md @@ -394,4 +394,4 @@ Christian Couder <>, Jakub Narębski <>, Markus Jansen <> and Kaartic Sivaraam <> -with help from Chandra Pratap and Brandon Pugh. +with help from Chandra Pratap, Brooke Kuhlmann and Brandon Pugh. From df27b55e27757512865b1ecc57d17422d787e4ef Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 1 Nov 2024 21:52:34 +0100 Subject: [PATCH 026/227] =?UTF-8?q?rn-116:=20add=20=C5=A0t=C4=9Bp=C3=A1n?= =?UTF-8?q?=20N=C4=9Bmec=20among=20the=20helpers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rev_news/drafts/edition-116.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-116.md b/rev_news/drafts/edition-116.md index 7daadf60f..dc2f6ac1f 100644 --- a/rev_news/drafts/edition-116.md +++ b/rev_news/drafts/edition-116.md @@ -394,4 +394,5 @@ Christian Couder <>, Jakub Narębski <>, Markus Jansen <> and Kaartic Sivaraam <> -with help from Chandra Pratap, Brooke Kuhlmann and Brandon Pugh. +with help from Chandra Pratap, Brooke Kuhlmann, +Štěpán Němec and Brandon Pugh. From 0edf97285742496dd750b86fb4d7aa1e89bf44de Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 1 Nov 2024 21:59:25 +0100 Subject: [PATCH 027/227] rn-116: add latest releases --- rev_news/drafts/edition-116.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rev_news/drafts/edition-116.md b/rev_news/drafts/edition-116.md index dc2f6ac1f..40bc28de5 100644 --- a/rev_news/drafts/edition-116.md +++ b/rev_news/drafts/edition-116.md @@ -366,7 +366,8 @@ __Git tools and sites__ + Git for Windows [2.47.0(2)](https://github.com/git-for-windows/git/releases/tag/v2.47.0.windows.2), [2.47.0(1)](https://github.com/git-for-windows/git/releases/tag/v2.47.0.windows.1), [2.47.0-rc1(1)](https://github.com/git-for-windows/git/releases/tag/v2.47.0-rc1.windows.1) -+ libgit2 [1.8.3](https://github.com/libgit2/libgit2/releases/tag/v1.8.3) ++ libgit2 [1.8.4](https://github.com/libgit2/libgit2/releases/tag/v1.8.4), +[1.8.3](https://github.com/libgit2/libgit2/releases/tag/v1.8.3) + GitLab [17.5.1, 17.4.3, 17.3.6](https://about.gitlab.com/releases/2024/10/23/patch-release-gitlab-17-5-1-released/), [17.5](https://about.gitlab.com/releases/2024/10/17/gitlab-17-5-released/), [17.4.2, 17.3.5, 17.2.9](https://about.gitlab.com/releases/2024/10/09/patch-release-gitlab-17-4-2-released/) @@ -384,7 +385,9 @@ __Git tools and sites__ [3.4.6](https://desktop.github.com/release-notes/) + Garden [1.9.0](https://github.com/garden-rs/garden/releases/tag/v1.9.0), [1.8.0](https://github.com/garden-rs/garden/releases/tag/v1.8.0) -+ GitButler [0.13.7](https://github.com/gitbutlerapp/gitbutler/releases/tag/release/0.13.7), ++ git-credential-oauth [0.13.3](https://github.com/hickford/git-credential-oauth/releases/tag/v0.13.3) ++ GitButler [0.13.8](https://github.com/gitbutlerapp/gitbutler/releases/tag/release/0.13.8), +[0.13.7](https://github.com/gitbutlerapp/gitbutler/releases/tag/release/0.13.7), [0.13.6](https://github.com/gitbutlerapp/gitbutler/releases/tag/release/0.13.6) ## Credits From 36edbf521bc5d8da9a4504885c1c3092b74ae1a8 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 1 Nov 2024 22:03:06 +0100 Subject: [PATCH 028/227] rn-116: fix link to Git 2.47.0 release notes --- rev_news/drafts/edition-116.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-116.md b/rev_news/drafts/edition-116.md index 40bc28de5..b46adb2f2 100644 --- a/rev_news/drafts/edition-116.md +++ b/rev_news/drafts/edition-116.md @@ -301,7 +301,9 @@ __Light reading__ by Joe Brockmeier on LWN\.net. + [Git For Each Ref](https://alchemists.io/articles/git_for_each_ref) by Brooke Kuhlmann. Learn how - to use this command to make use of references for information dumping, statistcs, and much more. Included in this article is use of the new `is-base` field name recently added in link:https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.47.0.txt[Git 2.47.0]. + to use this command to make use of references for information dumping, statistcs, and much more. + Included in this article is use of the new `is-base` field name recently added in + [Git 2.47.0](https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.47.0.txt). + [Searching for and navigating Git commits](https://alexharri.com/blog/searching-and-navigating-git-commits) by Alex Harri. From 4f477379a671d17383a103dffa1dc22933715740 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 1 Nov 2024 22:07:15 +0100 Subject: [PATCH 029/227] Publish rn-116 in _posts/ --- .../edition-116.md => _posts/2024-10-31-edition-116.markdown | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename rev_news/drafts/edition-116.md => _posts/2024-10-31-edition-116.markdown (100%) diff --git a/rev_news/drafts/edition-116.md b/_posts/2024-10-31-edition-116.markdown similarity index 100% rename from rev_news/drafts/edition-116.md rename to _posts/2024-10-31-edition-116.markdown From 4c2405e3ebb5273edd3dd4ee7bc992f3c033a8df Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 1 Nov 2024 22:07:15 +0100 Subject: [PATCH 030/227] Add draft for rn-117 --- rev_news/drafts/edition-117.md | 60 ++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 rev_news/drafts/edition-117.md diff --git a/rev_news/drafts/edition-117.md b/rev_news/drafts/edition-117.md new file mode 100644 index 000000000..cb853348d --- /dev/null +++ b/rev_news/drafts/edition-117.md @@ -0,0 +1,60 @@ +--- +title: Git Rev News Edition 117 (November 30th, 2024) +layout: default +date: 2024-11-30 12:06:51 +0100 +author: chriscool +categories: [news] +navbar: false +--- + +## Git Rev News: Edition 117 (November 30th, 2024) + +Welcome to the 117th edition of [Git Rev News](https://git.github.io/rev_news/rev_news/), +a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to +subscribe, see [the Git Rev News page](https://git.github.io/rev_news/rev_news/) on [git.github.io](http://git.github.io). + +This edition covers what happened during the months of October 2024 and November 2024. + +## Discussions + + + + + + + + + +## Other News + +__Various__ + + +__Light reading__ + + + +__Git tools and sites__ + + +## Releases + + +## Credits + +This edition of Git Rev News was curated by +Christian Couder <>, +Jakub Narębski <>, +Markus Jansen <> and +Kaartic Sivaraam <> +with help from XXX. From 9d868b17f561a7c0542f9c9d87466a85076042f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Nar=C4=99bski?= Date: Fri, 1 Nov 2024 23:27:15 +0100 Subject: [PATCH 031/227] rn-116: Fixes, reordering; naming sources, adding descriptions --- _posts/2024-10-31-edition-116.markdown | 35 ++++++++++++++------------ 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/_posts/2024-10-31-edition-116.markdown b/_posts/2024-10-31-edition-116.markdown index b46adb2f2..cf7e813ee 100644 --- a/_posts/2024-10-31-edition-116.markdown +++ b/_posts/2024-10-31-edition-116.markdown @@ -263,8 +263,8 @@ _Editor's note: Just like in our previous edition, we return with another __Various__ + [Highlights from Git 2.47](https://github.blog/open-source/git/highlights-from-git-2-47/) by Taylor Blau on GitHub Blog. Includes features like incremental multi-pack indexes, - `%(is-base:)` atom for `git for-each-ref`, the new - “[Platform Support Policy](https://github.com/git/git/blob/v2.47.0/Documentation/technical/platform-support.txt)” document, + `%(is-base:)` atom for `git for-each-ref` (see also the [Brooke Kuhlmann article](https://alchemists.io/articles/git_for_each_ref), mentioned below), + the new “[Platform Support Policy](https://github.com/git/git/blob/v2.47.0/Documentation/technical/platform-support.txt)” document, `git mergetool` directly supporting Visual Studio Code merge tool, and others. + [What's new in Git 2.47.0?](https://about.gitlab.com/blog/2024/10/07/whats-new-in-git-2-47-0/) by Justin Tobler on GitLab Blog. Highlights include @@ -285,13 +285,28 @@ __Light reading__ + [Using Git as Your Personal To-Do List](https://dev.to/munemprionto/using-git-as-your-personal-to-do-list-3kkd) by Munem Prionto on DEV\.to - more as a way of learning Git by the way of managing a TODO list, rather than for practical reasons. - + Contrast with [Using Git to Manage Todos](https://jezenthomas.com/2015/10/using-git-to-manage-todos/ + + Contrast with [Using Git to Manage Todos](https://jezenthomas.com/2015/10/using-git-to-manage-todos/) by Jezen Thomas (2015), mentioned in [Git Rev News Edition #9](https://git.github.io/rev_news/2015/11/11/edition-9/), which is about using Git to help manage TODO or FIXME comments in the codebase (assuming that for example your IDE does not have a plugin for managing TODOs). + One can also consider using a CLI tool that stores data in plain text files for managing TODOs, like [Taskwarrior](https://taskwarrior.org/). Plain text files work well with Git. ++ [Git For Each Ref](https://alchemists.io/articles/git_for_each_ref) + by Brooke Kuhlmann in Alchemists Collective articles. + Learn how to use this command to make use of references + for information dumping, statistcs, and much more. + Included in this article is use of the new `is-base` field name recently added in + [Git 2.47.0](https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.47.0.txt). ++ [Searching for and navigating Git commits](https://alexharri.com/blog/searching-and-navigating-git-commits) + by Alex Harri on his blog. ++ [Why some of us like "interdiff" code review](https://gist.github.com/thoughtpolice/9c45287550a56b2047c6311fbadebed2) + by Austin Seipp (a Gist). Describes problems with the UI of multi-commit GitHub Pull Requests + for responding to reviewer comments by provinding new version of patch series, + and how `git range-diff` and interactive rebase can help with this task. ++ [How I Review GitHub PRs](https://www.bitquabit.com/post/how-i-do-github-prs/) + by Benjamin Pollack on bitquabit. + + [Python PGP proposal poses packaging puzzles](https://lwn.net/Articles/993787/) by Joe Brockmeier on LWN\.net - [Sigstore](https://docs.sigstore.dev/) vs [OpenPGP](https://www.openpgp.org/). @@ -300,18 +315,6 @@ __Light reading__ + [A look at the aerc mail client](https://lwn.net/Articles/993498/) by Joe Brockmeier on LWN\.net. -+ [Git For Each Ref](https://alchemists.io/articles/git_for_each_ref) by Brooke Kuhlmann. Learn how - to use this command to make use of references for information dumping, statistcs, and much more. - Included in this article is use of the new `is-base` field name recently added in - [Git 2.47.0](https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.47.0.txt). - -+ [Searching for and navigating Git commits](https://alexharri.com/blog/searching-and-navigating-git-commits) - by Alex Harri. -+ [Why some of us like "interdiff" code review](https://gist.github.com/thoughtpolice/9c45287550a56b2047c6311fbadebed2) - by Austin Seipp. -+ [How I Review GitHub PRs](https://www.bitquabit.com/post/how-i-do-github-prs/) - by Benjamin Pollack. - @@ -321,7 +324,7 @@ __Scientific papers__ An Empirical Study of Its Performance"_, [arXiv:2409.13590]((https://arxiv.org/abs/2409.13590)), with dataset at (but no source code). - + based on a prior study: + + It is based on a prior study: Nugroho, et al.: _"How different are different diff algorithms in Git?: Use --histogram for code changes"_ (2019), From f2596468266ce03a35ae034559d76e09c2d2bcd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20N=C4=9Bmec?= Date: Tue, 5 Nov 2024 15:51:59 +0100 Subject: [PATCH 032/227] rn-116: fix up the last-minute additions (typos, language) --- _posts/2024-10-31-edition-116.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_posts/2024-10-31-edition-116.markdown b/_posts/2024-10-31-edition-116.markdown index cf7e813ee..814a3e233 100644 --- a/_posts/2024-10-31-edition-116.markdown +++ b/_posts/2024-10-31-edition-116.markdown @@ -295,14 +295,14 @@ __Light reading__ + [Git For Each Ref](https://alchemists.io/articles/git_for_each_ref) by Brooke Kuhlmann in Alchemists Collective articles. Learn how to use this command to make use of references - for information dumping, statistcs, and much more. + for information dumping, statistics, and much more. Included in this article is use of the new `is-base` field name recently added in [Git 2.47.0](https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.47.0.txt). + [Searching for and navigating Git commits](https://alexharri.com/blog/searching-and-navigating-git-commits) by Alex Harri on his blog. + [Why some of us like "interdiff" code review](https://gist.github.com/thoughtpolice/9c45287550a56b2047c6311fbadebed2) by Austin Seipp (a Gist). Describes problems with the UI of multi-commit GitHub Pull Requests - for responding to reviewer comments by provinding new version of patch series, + for responding to reviewer comments by providing a new version of the patch series, and how `git range-diff` and interactive rebase can help with this task. + [How I Review GitHub PRs](https://www.bitquabit.com/post/how-i-do-github-prs/) by Benjamin Pollack on bitquabit. From 4a11acb669b4cde874318446ad7e67fa583851ed Mon Sep 17 00:00:00 2001 From: Bruno Brito Date: Wed, 27 Nov 2024 12:04:34 +0000 Subject: [PATCH 033/227] rn-117: Add Tower's latest releases for Mac and Windows --- rev_news/drafts/edition-117.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rev_news/drafts/edition-117.md b/rev_news/drafts/edition-117.md index cb853348d..193b5428b 100644 --- a/rev_news/drafts/edition-117.md +++ b/rev_news/drafts/edition-117.md @@ -49,6 +49,8 @@ __Git tools and sites__ ## Releases ++ Tower for Windows [8.0](https://www.git-tower.com/release-notes/windows?show_tab=release-notes), [8.1](https://www.git-tower.com/release-notes/windows?show_tab=release-notes) ([Release blog post](https://www.git-tower.com/blog/tower-windows-8/)) ++ Tower for Mac [12.3](https://www.git-tower.com/release-notes/mac?show_tab=release-notes) ## Credits From 008a630c356db521132520f18946116530c216fb Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 29 Nov 2024 11:57:18 +0100 Subject: [PATCH 034/227] Mentoring-Guide: change DCO url --- Mentoring-Program-Guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mentoring-Program-Guide.md b/Mentoring-Program-Guide.md index 89176a0c1..52d2b4796 100644 --- a/Mentoring-Program-Guide.md +++ b/Mentoring-Program-Guide.md @@ -444,7 +444,7 @@ below: - [Git's SubmittingPatches doc](https://github.com/git/git/blob/master/Documentation/SubmittingPatches) This documentation contains the - [Developer's Certificate of Origin, or DCO for short](https://github.com/git/git/blob/master/Documentation/SubmittingPatches#L227-L263), + [Developer's Certificate of Origin, or DCO for short](https://git-scm.com/docs/SubmittingPatches#sign-off), which you have to know about when contributing to Git. - [Git's license](https://github.com/git/git/blob/master/COPYING) From b9f9f7937861183fda8b9b8a9bfedc90782d2f33 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 29 Nov 2024 12:58:25 +0100 Subject: [PATCH 035/227] rn-117: add releases --- rev_news/drafts/edition-117.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/rev_news/drafts/edition-117.md b/rev_news/drafts/edition-117.md index 193b5428b..2c5c98410 100644 --- a/rev_news/drafts/edition-117.md +++ b/rev_news/drafts/edition-117.md @@ -49,6 +49,25 @@ __Git tools and sites__ ## Releases ++ Git [2.47.1](https://public-inbox.org/git/xmqq5xob6coo.fsf@gitster.g/) ++ Git for Windows [2.47.1(1)](https://github.com/git-for-windows/git/releases/tag/v2.47.1.windows.1) ++ libgit2 [1.8.4](https://github.com/libgit2/libgit2/releases/tag/v1.8.4) ++ Gerrit Code Review [3.10.3](https://www.gerritcodereview.com/3.10.html#3103), +[3.8.10](https://www.gerritcodereview.com/3.8.html#3810), +[3.9.8](https://www.gerritcodereview.com/3.9.html#398) ++ GitHub Enterprise [3.15.0](https://help.github.com/enterprise-server@3.15/admin/release-notes#3.15.0) ++ GitLab [17.6.1](https://about.gitlab.com/releases/2024/11/26/patch-release-gitlab-17-6-1-released/), +[17.6](https://about.gitlab.com/releases/2024/11/21/gitlab-17-6-released/), +[17.5.2](https://about.gitlab.com/releases/2024/11/13/patch-release-gitlab-17-5-2-released/) ++ GitKraken [10.5.0](https://help.gitkraken.com/gitkraken-client/current/) ++ GitHub Desktop [3.4.9](https://desktop.github.com/release-notes/) ++ Sourcetree [4.2.10](https://product-downloads.atlassian.com/software/sourcetree/ReleaseNotes/Sourcetree_4.2.10.html), +[4.2.9](https://product-downloads.atlassian.com/software/sourcetree/ReleaseNotes/Sourcetree_4.2.9.html) ++ Garden [1.9.1](https://github.com/garden-rs/garden/releases/tag/v1.9.1) ++ Git Cola [4.9.0](https://github.com/git-cola/git-cola/releases/tag/v4.9.0) ++ git-credential-oauth [0.13.4](https://github.com/hickford/git-credential-oauth/releases/tag/v0.13.4) ++ GitButler [0.14.0](https://github.com/gitbutlerapp/gitbutler/releases/tag/release/0.14.0), +[0.13.17](https://github.com/gitbutlerapp/gitbutler/releases/tag/release/0.13.17) + Tower for Windows [8.0](https://www.git-tower.com/release-notes/windows?show_tab=release-notes), [8.1](https://www.git-tower.com/release-notes/windows?show_tab=release-notes) ([Release blog post](https://www.git-tower.com/blog/tower-windows-8/)) + Tower for Mac [12.3](https://www.git-tower.com/release-notes/mac?show_tab=release-notes) From a6ddb00428dc02d65ac2ba0a3544fe9dbb353ed4 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 29 Nov 2024 15:45:48 +0100 Subject: [PATCH 036/227] rn-117: add Bruno Brito among the helpers --- rev_news/drafts/edition-117.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-117.md b/rev_news/drafts/edition-117.md index 2c5c98410..74b0f756f 100644 --- a/rev_news/drafts/edition-117.md +++ b/rev_news/drafts/edition-117.md @@ -78,4 +78,4 @@ Christian Couder <>, Jakub Narębski <>, Markus Jansen <> and Kaartic Sivaraam <> -with help from XXX. +with help from Bruno Brito. From 9de4976757d39ecdd4f6f1269f3a96f4769e9c53 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 29 Nov 2024 15:47:00 +0100 Subject: [PATCH 037/227] rn-117: remove useless mention of 2024 --- rev_news/drafts/edition-117.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-117.md b/rev_news/drafts/edition-117.md index 74b0f756f..7874bf134 100644 --- a/rev_news/drafts/edition-117.md +++ b/rev_news/drafts/edition-117.md @@ -13,7 +13,7 @@ Welcome to the 117th edition of [Git Rev News](https://git.github.io/rev_news/re a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to subscribe, see [the Git Rev News page](https://git.github.io/rev_news/rev_news/) on [git.github.io](http://git.github.io). -This edition covers what happened during the months of October 2024 and November 2024. +This edition covers what happened during the months of October and November 2024. ## Discussions From b1977fb85580cfdb70b8619dfee0c1b188312ddf Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sat, 30 Nov 2024 06:34:36 +0100 Subject: [PATCH 038/227] rn-117: add article about dumb http bug --- rev_news/drafts/edition-117.md | 63 ++++++++++++++++++++++++++++++++-- 1 file changed, 61 insertions(+), 2 deletions(-) diff --git a/rev_news/drafts/edition-117.md b/rev_news/drafts/edition-117.md index 7874bf134..864295923 100644 --- a/rev_news/drafts/edition-117.md +++ b/rev_news/drafts/edition-117.md @@ -25,9 +25,68 @@ This edition covers what happened during the months of October and November 2024 ### Reviews --> - + ++ [Bug report: v2.47.0 cannot fetch version 1 pack indexes](https://lore.kernel.org/git/BA07EFA0-0793-420D-BED9-ACD7CEBE0112@townlong-yak.com/) + + Someone called 'fox' reported that when upgrading Git to v2.47.0 + from v2.46.2 or a previous version, cloning from their website, + which uses the old "dumb HTTP" protocol, stopped working. With + v2.47.0 there is an error message indicating that some index files + "differ in contents". + + Using `git bisect` fox found the commit that introduced the + issue. That commit implemented a check that verified that the index + file downloaded from the remote was byte-for-byte identical with the + index file generated locally from the Git objects downloaded as part + of the clone. + + That check failed because the remote had an index in the version 1 + format, while the locally generated index was in a more recent + format. And fox wondered if this was intentional. + + Eric Sunshine replied to fox that he could reproduce the problem. + + Jeff King, alias Peff, also replied to fox saying that the breakage + was not intended. He thought that it was better to rely on the + locally generated index, but that there should be no guarantee for + it to be identical to the one downloaded. + + Peff proposed a draft patch that discarded the downloaded version + before generating an index, but said it was hacky and didn't check + that the content was the same. So he suggested a better solution. + + He then proposed an improved draft patch, which implemented the + better solution he had suggested by marking the downloaded index as + temporary and then discarding it after a new one is generated. + + Taylor Blau, who was the temporary Git maintainer while Junio + Hamano, the usual maintainer, had some time off, replied to Eric and + fox in the meantime confirming it was an unintentional breakage, and + saying he was going to look at Peff's patches. + + Taylor then discussed with Peff the first draft patch and agreed + with Peff that the solution implemented in the improved draft patch + was better. + + So Taylor reviewed Peff's improved draft patch. He made some + comments but found it good, and asked Peff to add a test and to + propose it as a regular patch. + + Peff replied to Taylor's comments, proposed a draft test, and said + he was going to work on a proper patch as well as some cleanups and + refactors in the dumb HTTP code. + + Taylor found Peff's draft test "beautifully written". + + Peff then sent + [a series made of 11 patches](https://lore.kernel.org/git/20241025064148.GA2110169@coredump.intra.peff.net/) + to fix the issue, cleanup the dumb HTTP code and fix a couple of + other bugs or potential bugs he found in the process. + + Taylor reviewed the patch series and discussed a few technical + details with Peff. Overall he found the series good to go and + eventually merged it. + ++ [Doomed Keys and Hidden Threats: The Scariest Secrets in Your Repositories](https://blog.gitguardian.com/scary-secrets-2024/) + by Gaetan Ferry and + [The Extent of Hardcoded Secrets: From Development to Production](https://blog.gitguardian.com/the-extent-of-hardcoded-secrets-from-development-to-production/) + by Guillaume Valadon on GitGuardian Blog. + + __Git tools and sites__ ++ [GitFourchette](https://gitfourchette.org/) - The comfortable Git UI for Linux. + Under development; you can currenrly install it [with AppImage or from source](https://github.com/jorio/gitfourchette/releases). + Written in Python, using the Qt UI (via PyQt6/PySide6) and pygit2. Under GPLv3 license. ++ [Changesets](https://github.com/changesets/changesets) is a tool + to manage versioning and changelogs with a focus on multi-package repositories (monorepos). + Written in TypeScript, under MIT license. + + See [What is a Monorepo?](https://monorepo.tools/#what-is-a-monorepo) + definition on (this site was mentioned first in + [Git Rev News Edition #84](https://git.github.io/rev_news/2022/02/28/edition-84/)). ++ [Beachball](https://microsoft.github.io/beachball/): The Sunniest Semantic Version Bumper. + Tool for automating npm publishing. + Written in TypeScript, under MIT license. ++ [git-sizer](https://github.com/github/git-sizer) is a tool that computes various size metrics + for a Git repository, flagging those that might cause problems. + Written in Go, under MIT license. + + This tool was mentioned in passing in + [Git Rev News Edition #37](https://git.github.io/rev_news/2018/03/21/edition-37/). ++ [git-remote-s3](https://github.com/awslabs/git-remote-s3) is a library + that enables you to use Amazon S3 as a git remote and as a LFS server.
+ It provides an implementation of a [git remote-helper](https://github.com/awslabs/git-remote-s3) + to use S3 (Amazon Simple Storage Service) as a serverless Git server, and + of the [git-lfs custom transfer](https://github.com/git-lfs/git-lfs/blob/main/docs/custom-transfers.md) + to enable pushing LFS managed files to the same S3 bucket used as remote. + Written in Python, under Apache 2.0 license. ++ [Mergiraf](https://mergiraf.org/) is a syntax-aware [git merge driver](https://git-scm.com/docs/gitattributes#_performing_a_three_way_merge) + (and a `mergiraf` command line tool that helps solving merge conflicts) + for a growing collection of programming languages and file formats. + Adding new language to Mergiraf is done in a declarative way. + Written in Rust, under GPLv3 license. + + The author recommends using Mergiraf together with [Difftastic](https://difftastic.wilfred.me.uk/), + a structural diff tool that understands syntax, mentioned in + [Git Rev News Edition #86](https://git.github.io/rev_news/2022/04/30/edition-86/). ++ [Diffdiff.net](https://diffdiff.net/) (formerly diff.so) is a web application + that provides fast, [private](https://diffdiff.net/privacy) way to compare two pieces of text + in a "split diff"/"side diff" view, side by side with highlighting the text that is different + from the text on the other side. + + + ++ [DiffLens](https://www.difflens.com/) - The Developer's Diff Tool. + Provides language-aware semantic diffs for GitHub Pull Requests, + adding them as a comment to the pull request. + Available as the [GitHub app](https://github.com/marketplace/difflens) + or the [VS Code Extension](https://marketplace.visualstudio.com/items?itemName=DiffLens.difflens). + Proprietary tool, with 14 days free trial, and [demo](https://www.difflensapp.com/difflensDemo2_849ca26f9ee09faa084cbdcdc90b6f90f8ce8495). + See above for possible alternatives. + ## Releases From f10de59f91bd43715bae42924ba72edbf6661805 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Nar=C4=99bski?= Date: Sun, 1 Dec 2024 04:11:13 +0100 Subject: [PATCH 040/227] rn-117: Add link to the PatchScope tool --- rev_news/drafts/edition-117.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/rev_news/drafts/edition-117.md b/rev_news/drafts/edition-117.md index 45c41326a..42ce453fa 100644 --- a/rev_news/drafts/edition-117.md +++ b/rev_news/drafts/edition-117.md @@ -191,6 +191,13 @@ __Git tools and sites__ of the [git-lfs custom transfer](https://github.com/git-lfs/git-lfs/blob/main/docs/custom-transfers.md) to enable pushing LFS managed files to the same S3 bucket used as remote. Written in Python, under Apache 2.0 license. ++ [PatchScope](https://github.com/ncusi/PatchScope) is a tool that + annotates files and lines of diffs (patches) with their purpose and type, + and performs statistical analysis on diffs and on the generated annotation data. + It also includes a web app, displaying various data visualizations. + Written in Python, under MIT license. + + Its README includes the [list of similar tools and sites](https://github.com/ncusi/PatchScope/blob/main/README.md#related-projects), + many of which were mentioned here on Git Rev News. + [Mergiraf](https://mergiraf.org/) is a syntax-aware [git merge driver](https://git-scm.com/docs/gitattributes#_performing_a_three_way_merge) (and a `mergiraf` command line tool that helps solving merge conflicts) for a growing collection of programming languages and file formats. From 3616be0eed22f15385c60be90169aa97bfaa117a Mon Sep 17 00:00:00 2001 From: Kaartic Sivaraam Date: Sun, 1 Dec 2024 12:20:29 +0530 Subject: [PATCH 041/227] rn-117: add interview with Ghanshyam Thakkar --- rev_news/drafts/edition-117.md | 135 ++++++++++++++++++++++++++++++++- 1 file changed, 132 insertions(+), 3 deletions(-) diff --git a/rev_news/drafts/edition-117.md b/rev_news/drafts/edition-117.md index 42ce453fa..fdc4e894b 100644 --- a/rev_news/drafts/edition-117.md +++ b/rev_news/drafts/edition-117.md @@ -88,9 +88,138 @@ This edition covers what happened during the months of October and November 2024 details with Peff. Overall he found the series good to go and eventually merged it. - + +## Developer Spotlight: Ghanshyam Thakkar + +* Who are you and what do you do? + + I am Ghanshyam Thakkar. I was an undergrad student in Electronics + when I started contributing to Git. I am now a Software Engineer at a + startup. I sometimes contribute to open source projects in my free time, + and explore/learn new technologies. + +* How did you initially become interested in contributing to Git, + and what motivated you to choose it as your GSoC project? + + Before GSoC, I was quite familiar with the Linux ecosystem and it had + been my primary OS for the majority of my college years. And during + those times I felt Git was the most impactful project enabling the vastly + collaborative Linux Desktop Ecosystem. So, I felt like contributing + to Git would be a great opportunity to learn and contribute to a + project that had been so crucial to my everyday workflow. + +* How do you feel your contribution has impacted the Git community + or the broader open source ecosystem? + + Before my GSoC project, I had contributed some small patches, which + could be considered as bug fix, general code cleanup, expanding test + coverage, etc. Some of which can be observed in user-space. But my GSoC + project was about migrating Git's test suite to a purely C-based + test framework, which was not user-facing, however, was a step in the + right direction for the project as a whole. + +* Is there any aspect of Git that you now see differently after + having contributed to it? + + The mailing list workflow. Although, I was skeptical about it at first + because I had never used mailing lists before, I now see it as a very + effective way to communicate and collaborate on a project of such + massive scale. Although, I still am not a big fan of the all or nothing + nature of the mailing lists. Subscribing to mails of a specific area + would have been great. Although, I do understand that it can + probably be done with filtering using a script. + +* How do you balance your contributions with other responsibilities + like work or school? + + When I was contributing to Git as part of GSoC, I was a student and I + also had summer vacation, so it was quite easy for me to balance my + contributions with my personal life. However, now that I am quite busy with my + $DAYJOB, I don't have much bandwidth to contribute to open + source in the short term. But I am planning to start contributing again + after some time. + +* Can you share how GSoC helped enhance your technical and + non-technical skills (like communication, project management, etc.)? + + I would say it helped me improve my technical communication skills immensely. + Going back and forth with the reviewers on the list, I learned quite a + bit about how to communicate effectively. Also, this was my first time + working in a C based project, so I learned some C hacks as well! + +* What was your biggest takeaway or learning from GSoC that you now + apply regularly in your work? + + Technical communication and effective code review. Also more effective + Git usage. + +* What was the biggest challenge you faced during your contributions + to Git, and how did you overcome it? + + More than the technical challenges solving a problem, I would say it was + more challenging finding the relevant work to do, as there is no + official issue tracker. I would search for #leftoverbits on the mailing + list and #TODOs in the codebase to the find the things to do. However, + most of them seemed quite out of reach in terms of difficulty. However, + I attempted them anyway and learned a lot in the process. The mailing + list folks were quite helpful in guiding me in the right direction. + +* Have you thought about mentoring new GSoC students? + + Yes, although I don't have the bandwidth to become a primary mentor, + I would love to be a co-mentor. + +* If you could get a team of expert developers to work full time on + something in Git for a full year, what would it be? + + Honestly, I find Git to be quite mature and complete. I can't + think of anything, of the top of my head, that I would like + people to work on for a full year. + +* What upcoming features or changes in Git are you particularly + excited about? + + Rust adoption. + +* What is your favorite Git-related tool/library, outside of Git + itself? + + I quite frequently find myself using [`lazygit`](https://github.com/jesseduffield/lazygit) + on the command line for some quick and dirty git operations. + +* What is your toolbox for interacting with the mailing list and for + development of Git? + + I use [aerc](https://aerc-mail.org/) and `send-email`/`format-patch` + for email interactions. And for development, I use [Neovim](https://neovim.io/) + and [clang LSP](https://gist.github.com/Strus/042a92a00070a943053006bf46912ae9) + with `GENERATE_COMPILATION_DATABASE` build flag. + +* How do you envision your own involvement with Git or other open + source projects in the future? + + I think I will continue to be a part of the open source community in some + way or the other. My perspective towards open source has always been + very positive and I would like to continue contributing to it. + +* What is your advice for people who want to start Git development? + Where and how should they start? + + I would suggest to start from reading the docs, particularly + [MyFirstContribution](https://git-scm.com/docs/MyFirstContribution) + and [SubmittingPatches](https://git-scm.com/docs/SubmittingPatches). + And then start with some [#leftoverbits](https://lore.kernel.org/git/?q=%23leftoverbits) + or if you are particularly interested in a specific area, you can + even reach out to people working on those areas to ask for guidance. + +* Would you recommend other students or contributors to participate in + the GSoC, or other mentoring programs, working on Git? Why? Do you + have advice for them? + + Absolutely! GSoC is a great opportunity to learn and contribute to open + source projects. It is a great way to learn how a project of such + massive scale is managed and developed. + ## Other News From 60a0b23d3767f2b54d04a34e434ef999b13b6ae8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20N=C4=9Bmec?= Date: Sun, 1 Dec 2024 11:37:17 +0100 Subject: [PATCH 042/227] rn-117: minor copy edit --- rev_news/drafts/edition-117.md | 45 +++++++++++++++++----------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/rev_news/drafts/edition-117.md b/rev_news/drafts/edition-117.md index fdc4e894b..f2fa16828 100644 --- a/rev_news/drafts/edition-117.md +++ b/rev_news/drafts/edition-117.md @@ -35,7 +35,7 @@ This edition covers what happened during the months of October and November 2024 v2.47.0 there is an error message indicating that some index files "differ in contents". - Using `git bisect` fox found the commit that introduced the + Using `git bisect`, fox found the commit that introduced the issue. That commit implemented a check that verified that the index file downloaded from the remote was byte-for-byte identical with the index file generated locally from the Git objects downloaded as part @@ -50,7 +50,7 @@ This edition covers what happened during the months of October and November 2024 Jeff King, alias Peff, also replied to fox saying that the breakage was not intended. He thought that it was better to rely on the locally generated index, but that there should be no guarantee for - it to be identical to the one downloaded. + it to be identical to the downloaded one. Peff proposed a draft patch that discarded the downloaded version before generating an index, but said it was hacky and didn't check @@ -81,7 +81,7 @@ This edition covers what happened during the months of October and November 2024 Peff then sent [a series made of 11 patches](https://lore.kernel.org/git/20241025064148.GA2110169@coredump.intra.peff.net/) - to fix the issue, cleanup the dumb HTTP code and fix a couple of + to fix the issue, clean up the dumb HTTP code and fix a couple of other bugs or potential bugs he found in the process. Taylor reviewed the patch series and discussed a few technical @@ -159,7 +159,7 @@ This edition covers what happened during the months of October and November 2024 More than the technical challenges solving a problem, I would say it was more challenging finding the relevant work to do, as there is no official issue tracker. I would search for #leftoverbits on the mailing - list and #TODOs in the codebase to the find the things to do. However, + list and #TODOs in the codebase to find things to do. However, most of them seemed quite out of reach in terms of difficulty. However, I attempted them anyway and learned a lot in the process. The mailing list folks were quite helpful in guiding me in the right direction. @@ -173,7 +173,7 @@ This edition covers what happened during the months of October and November 2024 something in Git for a full year, what would it be? Honestly, I find Git to be quite mature and complete. I can't - think of anything, of the top of my head, that I would like + think of anything, off the top of my head, that I would like people to work on for a full year. * What upcoming features or changes in Git are you particularly @@ -242,12 +242,12 @@ __Light reading__ + Based on the ["A Novel Approach for Estimating Truck Factors"](https://arxiv.org/abs/1604.06766) paper from 2016 by Guilherme Avelino, Leonardo Passos, Andre Hora, and Marco Tulio Valente, with many citations since. - Original implemetation available at . + Original implementation available at . + [How we shrunk our Javascript monorepo git size by 94%](https://www.jonathancreamer.com/how-we-shrunk-our-git-repo-size-by-94-percent/) - Mentions using [git-sizer](https://github.com/github/git-sizer) tool + Mentions using the [git-sizer](https://github.com/github/git-sizer) tool which was mentioned in passing in [Git Rev News Edition #37](https://git.github.io/rev_news/2018/03/21/edition-37/). - The work described in the article also led to adding `--path-walk` option to `git repack` - and `pack.usePathWalk` config option to Git, + The work described in the article also led to adding the `--path-walk` option to `git repack` + and the `pack.usePathWalk` config option to Git, and to the new experimental [`git survey`](https://github.com/microsoft/git/pull/667) command (that for now is present in Microsoft's fork of Git), + [Deleted your fork. Is it gone? Not really…](https://ygreky.com/2024/07/deleted-your-fork-is-it-gone-not-really/) @@ -261,7 +261,7 @@ __Light reading__ with the help of `git config` features: `includeIf` with `gitdir:` and with `hasconfig:`, and with `~/.ssh/config` (and `insteadOf`, where needed). Written by Benji Encalada Mora on their blog - (with comment "This may be overkill, but it works on my machine"). + (with a comment of "This may be overkill, but it works on my machine"). + [When to rewrite Git history?](https://drewdeponte.com/blog/when-to-rewrite-git-history/) (beside "Don't rewrite history once it is shared."). Written by Drew De Ponte on his blog. + [[The Ultimate Guide to] Git Commit Creation](https://drewdeponte.com/blog/git-commit-creation/) @@ -269,11 +269,11 @@ __Light reading__ + [How to Use Git Stash to Efficiently Manage Your Code](https://www.freecodecamp.org/news/how-to-use-git-stash-to-manage-code) by Okoro Emmanuel Nzube on freeCodeCamp. + [Finding when a bug was fixed with git bisect](https://jvns.ca/til/finding-when-a-bug-was-fixed-with-git-bisect/) - in Julia Evans [TILs](https://jvns.ca/til/) (Today I have Learned). - + Julia Evans wrote earlier a series of articles on Git, which were referenced in + in Julia Evans [TILs](https://jvns.ca/til/) (Today I Learned). + + Julia Evans has written a series of articles on Git, which were referenced in Git Rev News from [Edition #103](https://git.github.io/rev_news/2023/09/30/edition-103/) to [#111](https://git.github.io/rev_news/2024/05/31/edition-111/). - + She wrote two [zines](https://wizardzines.com/) about Git: + + She has also published two [zines](https://wizardzines.com/) about Git: _[Oh shit, git!](https://wizardzines.com/zines/oh-shit-git/)_ and _[How Git Works](https://wizardzines.com/zines/git/)_ + [Quick tip: Ignore commits in Git blame using a file](https://marijkeluttekes.dev/blog/articles/2024/11/17/quick-tip-ignore-commits-in-git-blame-using-a-file/) @@ -297,13 +297,14 @@ __Easy watching__ __Git tools and sites__ + [GitFourchette](https://gitfourchette.org/) - The comfortable Git UI for Linux. - Under development; you can currenrly install it [with AppImage or from source](https://github.com/jorio/gitfourchette/releases). + Under development; you can currently install it [with AppImage or from source](https://github.com/jorio/gitfourchette/releases). Written in Python, using the Qt UI (via PyQt6/PySide6) and pygit2. Under GPLv3 license. + [Changesets](https://github.com/changesets/changesets) is a tool to manage versioning and changelogs with a focus on multi-package repositories (monorepos). Written in TypeScript, under MIT license. - + See [What is a Monorepo?](https://monorepo.tools/#what-is-a-monorepo) - definition on (this site was mentioned first in + + For an explanation of the "monorepo" concept see + [What is a Monorepo?](https://monorepo.tools/#what-is-a-monorepo) + on (this site was mentioned first in [Git Rev News Edition #84](https://git.github.io/rev_news/2022/02/28/edition-84/)). + [Beachball](https://microsoft.github.io/beachball/): The Sunniest Semantic Version Bumper. Tool for automating npm publishing. @@ -314,7 +315,7 @@ __Git tools and sites__ + This tool was mentioned in passing in [Git Rev News Edition #37](https://git.github.io/rev_news/2018/03/21/edition-37/). + [git-remote-s3](https://github.com/awslabs/git-remote-s3) is a library - that enables you to use Amazon S3 as a git remote and as a LFS server.
+ that enables you to use Amazon S3 as a git remote and as an LFS server.
It provides an implementation of a [git remote-helper](https://github.com/awslabs/git-remote-s3) to use S3 (Amazon Simple Storage Service) as a serverless Git server, and of the [git-lfs custom transfer](https://github.com/git-lfs/git-lfs/blob/main/docs/custom-transfers.md) @@ -325,18 +326,18 @@ __Git tools and sites__ and performs statistical analysis on diffs and on the generated annotation data. It also includes a web app, displaying various data visualizations. Written in Python, under MIT license. - + Its README includes the [list of similar tools and sites](https://github.com/ncusi/PatchScope/blob/main/README.md#related-projects), + + Its README includes a [list of similar tools and sites](https://github.com/ncusi/PatchScope/blob/main/README.md#related-projects), many of which were mentioned here on Git Rev News. + [Mergiraf](https://mergiraf.org/) is a syntax-aware [git merge driver](https://git-scm.com/docs/gitattributes#_performing_a_three_way_merge) (and a `mergiraf` command line tool that helps solving merge conflicts) for a growing collection of programming languages and file formats. - Adding new language to Mergiraf is done in a declarative way. + Adding a new language to Mergiraf is done in a declarative way. Written in Rust, under GPLv3 license. + The author recommends using Mergiraf together with [Difftastic](https://difftastic.wilfred.me.uk/), a structural diff tool that understands syntax, mentioned in [Git Rev News Edition #86](https://git.github.io/rev_news/2022/04/30/edition-86/). + [Diffdiff.net](https://diffdiff.net/) (formerly diff.so) is a web application - that provides fast, [private](https://diffdiff.net/privacy) way to compare two pieces of text + that provides a fast, [private](https://diffdiff.net/privacy) way to compare two pieces of text in a "split diff"/"side diff" view, side by side with highlighting the text that is different from the text on the other side. @@ -345,8 +346,8 @@ __Git tools and sites__ + [DiffLens](https://www.difflens.com/) - The Developer's Diff Tool. Provides language-aware semantic diffs for GitHub Pull Requests, adding them as a comment to the pull request. - Available as the [GitHub app](https://github.com/marketplace/difflens) - or the [VS Code Extension](https://marketplace.visualstudio.com/items?itemName=DiffLens.difflens). + Available as a [GitHub app](https://github.com/marketplace/difflens) + or a [VS Code Extension](https://marketplace.visualstudio.com/items?itemName=DiffLens.difflens). Proprietary tool, with 14 days free trial, and [demo](https://www.difflensapp.com/difflensDemo2_849ca26f9ee09faa084cbdcdc90b6f90f8ce8495). See above for possible alternatives. From 8330e5de65e86f8fcd6bc220f8f3fce7f9285178 Mon Sep 17 00:00:00 2001 From: Kaartic Sivaraam Date: Sun, 1 Dec 2024 19:19:46 +0530 Subject: [PATCH 043/227] rn-117: remove an empty section --- rev_news/drafts/edition-117.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/rev_news/drafts/edition-117.md b/rev_news/drafts/edition-117.md index fdc4e894b..8731fc273 100644 --- a/rev_news/drafts/edition-117.md +++ b/rev_news/drafts/edition-117.md @@ -223,9 +223,6 @@ This edition covers what happened during the months of October and November 2024 ## Other News -__Various__ - - __Light reading__ + [The Bus Factor](https://mclare.blog/posts/the-bus-factor/) From d9c340f41a3b9f2febbf7b8d6a999963bd52df71 Mon Sep 17 00:00:00 2001 From: Kaartic Sivaraam Date: Sun, 1 Dec 2024 19:22:22 +0530 Subject: [PATCH 044/227] rn-117: make a typo correction as suggested by Ghanshyam --- rev_news/drafts/edition-117.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-117.md b/rev_news/drafts/edition-117.md index 8731fc273..b3093ea7a 100644 --- a/rev_news/drafts/edition-117.md +++ b/rev_news/drafts/edition-117.md @@ -192,7 +192,7 @@ This edition covers what happened during the months of October and November 2024 I use [aerc](https://aerc-mail.org/) and `send-email`/`format-patch` for email interactions. And for development, I use [Neovim](https://neovim.io/) - and [clang LSP](https://gist.github.com/Strus/042a92a00070a943053006bf46912ae9) + and [clangd LSP](https://gist.github.com/Strus/042a92a00070a943053006bf46912ae9) with `GENERATE_COMPILATION_DATABASE` build flag. * How do you envision your own involvement with Git or other open From 9479550106fe20156b58061468aa1749e1ef148e Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sun, 1 Dec 2024 16:54:30 +0100 Subject: [PATCH 045/227] rn-117: add Toon Claes among the helpers --- rev_news/drafts/edition-117.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-117.md b/rev_news/drafts/edition-117.md index b3093ea7a..1dab2f921 100644 --- a/rev_news/drafts/edition-117.md +++ b/rev_news/drafts/edition-117.md @@ -379,4 +379,4 @@ Christian Couder <>, Jakub Narębski <>, Markus Jansen <> and Kaartic Sivaraam <> -with help from Bruno Brito. +with help from Bruno Brito and Toon Claes. From 9e1b911b025af132fff930a8da466ed53402ec04 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sun, 1 Dec 2024 16:55:40 +0100 Subject: [PATCH 046/227] rn-117: add Ghanshyam Thakkar among the helpers --- rev_news/drafts/edition-117.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-117.md b/rev_news/drafts/edition-117.md index 1dab2f921..2f0f09c63 100644 --- a/rev_news/drafts/edition-117.md +++ b/rev_news/drafts/edition-117.md @@ -379,4 +379,4 @@ Christian Couder <>, Jakub Narębski <>, Markus Jansen <> and Kaartic Sivaraam <> -with help from Bruno Brito and Toon Claes. +with help from Ghanshyam Thakkar, Bruno Brito and Toon Claes. From 7619892ad93b8caab9ad4910a18fc81f02501c71 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sun, 1 Dec 2024 16:57:14 +0100 Subject: [PATCH 047/227] rn-117: add Dscho among the helpers --- rev_news/drafts/edition-117.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-117.md b/rev_news/drafts/edition-117.md index 2f0f09c63..48f281837 100644 --- a/rev_news/drafts/edition-117.md +++ b/rev_news/drafts/edition-117.md @@ -379,4 +379,5 @@ Christian Couder <>, Jakub Narębski <>, Markus Jansen <> and Kaartic Sivaraam <> -with help from Ghanshyam Thakkar, Bruno Brito and Toon Claes. +with help from Ghanshyam Thakkar, Johannes Schindelin, +Bruno Brito and Toon Claes. From 0e2d9c7ffb62c4965863c65c0c4b7ce67cbe3d36 Mon Sep 17 00:00:00 2001 From: Markus Jansen Date: Sun, 1 Dec 2024 22:11:03 +0100 Subject: [PATCH 048/227] Supplied some tiny corrections and rephrasings. --- rev_news/drafts/edition-117.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/rev_news/drafts/edition-117.md b/rev_news/drafts/edition-117.md index 365c45e44..0b0b9b8bc 100644 --- a/rev_news/drafts/edition-117.md +++ b/rev_news/drafts/edition-117.md @@ -101,7 +101,7 @@ This edition covers what happened during the months of October and November 2024 * How did you initially become interested in contributing to Git, and what motivated you to choose it as your GSoC project? - Before GSoC, I was quite familiar with the Linux ecosystem and it had + Before GSoC, I was quite familiar with the Linux ecosystem, and it had been my primary OS for the majority of my college years. And during those times I felt Git was the most impactful project enabling the vastly collaborative Linux Desktop Ecosystem. So, I felt like contributing @@ -185,7 +185,7 @@ This edition covers what happened during the months of October and November 2024 itself? I quite frequently find myself using [`lazygit`](https://github.com/jesseduffield/lazygit) - on the command line for some quick and dirty git operations. + on the command line for some quick and dirty Git operations. * What is your toolbox for interacting with the mailing list and for development of Git? @@ -193,7 +193,7 @@ This edition covers what happened during the months of October and November 2024 I use [aerc](https://aerc-mail.org/) and `send-email`/`format-patch` for email interactions. And for development, I use [Neovim](https://neovim.io/) and [clangd LSP](https://gist.github.com/Strus/042a92a00070a943053006bf46912ae9) - with `GENERATE_COMPILATION_DATABASE` build flag. + with the `GENERATE_COMPILATION_DATABASE` build flag. * How do you envision your own involvement with Git or other open source projects in the future? @@ -248,15 +248,15 @@ __Light reading__ and to the new experimental [`git survey`](https://github.com/microsoft/git/pull/667) command (that for now is present in Microsoft's fork of Git), + [Deleted your fork. Is it gone? Not really…](https://ygreky.com/2024/07/deleted-your-fork-is-it-gone-not-really/) - Marta Rybczynska on Ygreky Blog. Provides some recommendations for best practices + by Marta Rybczynska on Ygreky Blog. Provides some recommendations for best practices when using public forges. + References [Anyone can Access Deleted and Private Repository Data on GitHub](https://trufflesecurity.com/blog/anyone-can-access-deleted-and-private-repo-data-github) blog post by Truffle Security, mentioned in [Git Rev News Edition #113](https://git.github.io/rev_news/2024/07/31/edition-113/). + See also [Demystifying GitHub Private Forks - The Hidden Danger of Cached View](https://blog.gitguardian.com/demystifying-github-cached-views-the-hidden-danger/) by Guillaume Valadon on GitGuardian Blog. + [How I configure my Git identities](https://www.benji.dog/articles/git-config/) - with the help of `git config` features: `includeIf` with `gitdir:` and with `hasconfig:`, - and with `~/.ssh/config` (and `insteadOf`, where needed). + with the help of `git config` features: `includeIf` with `gitdir:` and `hasconfig:`, + complex `~/.ssh/config` setups (and the use of `insteadOf`, where needed). Written by Benji Encalada Mora on their blog (with a comment of "This may be overkill, but it works on my machine"). + [When to rewrite Git history?](https://drewdeponte.com/blog/when-to-rewrite-git-history/) @@ -301,7 +301,7 @@ __Git tools and sites__ Written in TypeScript, under MIT license. + For an explanation of the "monorepo" concept see [What is a Monorepo?](https://monorepo.tools/#what-is-a-monorepo) - on (this site was mentioned first in + on monorepo.tools (this site was mentioned first in [Git Rev News Edition #84](https://git.github.io/rev_news/2022/02/28/edition-84/)). + [Beachball](https://microsoft.github.io/beachball/): The Sunniest Semantic Version Bumper. Tool for automating npm publishing. @@ -345,7 +345,7 @@ __Git tools and sites__ adding them as a comment to the pull request. Available as a [GitHub app](https://github.com/marketplace/difflens) or a [VS Code Extension](https://marketplace.visualstudio.com/items?itemName=DiffLens.difflens). - Proprietary tool, with 14 days free trial, and [demo](https://www.difflensapp.com/difflensDemo2_849ca26f9ee09faa084cbdcdc90b6f90f8ce8495). + Proprietary tool, with 14 days free trial and [demo](https://www.difflensapp.com/difflensDemo2_849ca26f9ee09faa084cbdcdc90b6f90f8ce8495). See above for possible alternatives. From 568080f46ac02f09812dc31fde63e213bbbbc40d Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sun, 1 Dec 2024 22:26:41 +0100 Subject: [PATCH 049/227] Publish rn-117 in _posts/ --- .../edition-117.md => _posts/2024-11-30-edition-117.markdown | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename rev_news/drafts/edition-117.md => _posts/2024-11-30-edition-117.markdown (100%) diff --git a/rev_news/drafts/edition-117.md b/_posts/2024-11-30-edition-117.markdown similarity index 100% rename from rev_news/drafts/edition-117.md rename to _posts/2024-11-30-edition-117.markdown From 3dbbe2d69c2424f0915bee6ea6eb6e37348ab0ff Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sun, 1 Dec 2024 22:26:41 +0100 Subject: [PATCH 050/227] Add draft for rn-118 --- rev_news/drafts/edition-118.md | 60 ++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 rev_news/drafts/edition-118.md diff --git a/rev_news/drafts/edition-118.md b/rev_news/drafts/edition-118.md new file mode 100644 index 000000000..a86362a39 --- /dev/null +++ b/rev_news/drafts/edition-118.md @@ -0,0 +1,60 @@ +--- +title: Git Rev News Edition 118 (December 31st, 2024) +layout: default +date: 2024-12-31 12:06:51 +0100 +author: chriscool +categories: [news] +navbar: false +--- + +## Git Rev News: Edition 118 (December 31st, 2024) + +Welcome to the 118th edition of [Git Rev News](https://git.github.io/rev_news/rev_news/), +a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to +subscribe, see [the Git Rev News page](https://git.github.io/rev_news/rev_news/) on [git.github.io](http://git.github.io). + +This edition covers what happened during the months of November 2024 and December 2024. + +## Discussions + + + + + + + + + +## Other News + +__Various__ + + +__Light reading__ + + + +__Git tools and sites__ + + +## Releases + + +## Credits + +This edition of Git Rev News was curated by +Christian Couder <>, +Jakub Narębski <>, +Markus Jansen <> and +Kaartic Sivaraam <> +with help from XXX. From 6e6dc58066cf0184066d6b822cf87a7f75fc190b Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sun, 1 Dec 2024 22:29:02 +0100 Subject: [PATCH 051/227] =?UTF-8?q?rn-117:=20add=20=C5=A0t=C4=9Bp=C3=A1n?= =?UTF-8?q?=20N=C4=9Bmec=20among=20the=20helpers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _posts/2024-11-30-edition-117.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/2024-11-30-edition-117.markdown b/_posts/2024-11-30-edition-117.markdown index 0b0b9b8bc..ffa294b1b 100644 --- a/_posts/2024-11-30-edition-117.markdown +++ b/_posts/2024-11-30-edition-117.markdown @@ -381,4 +381,4 @@ Jakub Narębski <>, Markus Jansen <> and Kaartic Sivaraam <> with help from Ghanshyam Thakkar, Johannes Schindelin, -Bruno Brito and Toon Claes. +Štěpán Němec, Bruno Brito and Toon Claes. From 6f75b6d2a12fa96c781fb6822833f66fe2463480 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Mon, 30 Dec 2024 15:52:50 +0100 Subject: [PATCH 052/227] rn-118: add releases --- rev_news/drafts/edition-118.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/rev_news/drafts/edition-118.md b/rev_news/drafts/edition-118.md index a86362a39..899ab8165 100644 --- a/rev_news/drafts/edition-118.md +++ b/rev_news/drafts/edition-118.md @@ -49,6 +49,31 @@ __Git tools and sites__ ## Releases ++ Git [2.48.0-rc0](https://public-inbox.org/git/xmqqfrmn4hr9.fsf@gitster.g/) ++ Git for Windows [2.48.0-rc0(1)](https://github.com/git-for-windows/git/releases/tag/v2.48.0-rc0.windows.1) ++ libgit2 [1.9.0](https://github.com/libgit2/libgit2/releases/tag/v1.9.0) ++ GitHub Enterprise [3.15.1](https://help.github.com/enterprise-server@3.15/admin/release-notes#3.15.1), +[3.14.6](https://help.github.com/enterprise-server@3.14/admin/release-notes#3.14.6), +[3.13.9](https://help.github.com/enterprise-server@3.13/admin/release-notes#3.13.9), +[3.12.13](https://help.github.com/enterprise-server@3.12/admin/release-notes#3.12.13), +[3.11.19](https://help.github.com/enterprise-server@3.11/admin/release-notes#3.11.19), +[3.15.0](https://help.github.com/enterprise-server@3.15/admin/release-notes#3.15.0), +[3.14.5](https://help.github.com/enterprise-server@3.14/admin/release-notes#3.14.5), +[3.13.8](https://help.github.com/enterprise-server@3.13/admin/release-notes#3.13.8), +[3.12.12](https://help.github.com/enterprise-server@3.12/admin/release-notes#3.12.12), +[3.11.18](https://help.github.com/enterprise-server@3.11/admin/release-notes#3.11.18) ++ GitLab [17.7](https://about.gitlab.com/releases/2024/12/19/gitlab-17-7-released/), +[17.6.2, 17.5.4, 17.4.6](https://about.gitlab.com/releases/2024/12/11/patch-release-gitlab-17-6-2-released/) ++ Gerrit Code Review [3.11.0](https://www.gerritcodereview.com/3.11.html#3110) ++ GitKraken [10.6.0](https://help.gitkraken.com/gitkraken-client/current/) ++ GitHub Desktop [3.4.12](https://desktop.github.com/release-notes/), +[3.4.11](https://desktop.github.com/release-notes/), +[3.4.10](https://desktop.github.com/release-notes/) ++ Garden [1.10.0](https://github.com/garden-rs/garden/releases/tag/v1.10.0) ++ Git Cola [4.10.1](https://github.com/git-cola/git-cola/releases/tag/v4.10.1), +[4.10.0](https://github.com/git-cola/git-cola/releases/tag/v4.10.0) ++ GitButler [0.14.4](https://github.com/gitbutlerapp/gitbutler/releases/tag/release/0.14.4), +[0.14.3](https://github.com/gitbutlerapp/gitbutler/releases/tag/release/0.14.3) ## Credits From 617ac894b62985417b929327abaed7ec47190f56 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Mon, 30 Dec 2024 15:54:18 +0100 Subject: [PATCH 053/227] rn-118: remove useless mention of 2024 --- rev_news/drafts/edition-118.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-118.md b/rev_news/drafts/edition-118.md index 899ab8165..d1f9b9932 100644 --- a/rev_news/drafts/edition-118.md +++ b/rev_news/drafts/edition-118.md @@ -13,7 +13,7 @@ Welcome to the 118th edition of [Git Rev News](https://git.github.io/rev_news/re a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to subscribe, see [the Git Rev News page](https://git.github.io/rev_news/rev_news/) on [git.github.io](http://git.github.io). -This edition covers what happened during the months of November 2024 and December 2024. +This edition covers what happened during the months of November and December 2024. ## Discussions From 7020f21ad11d060576c54783ef56586287e763c4 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Tue, 31 Dec 2024 10:53:27 +0100 Subject: [PATCH 054/227] rn-118: add Meson build system article --- rev_news/drafts/edition-118.md | 134 ++++++++++++++++++++++++++++++++- 1 file changed, 132 insertions(+), 2 deletions(-) diff --git a/rev_news/drafts/edition-118.md b/rev_news/drafts/edition-118.md index d1f9b9932..945a4475a 100644 --- a/rev_news/drafts/edition-118.md +++ b/rev_news/drafts/edition-118.md @@ -25,9 +25,139 @@ This edition covers what happened during the months of November and December 202 ### Reviews --> - + ++ [./configure fails to link test program due to missing dependencies](https://lore.kernel.org/git/GV1PR02MB848925A79A9DD733848182D58D662@GV1PR02MB8489.eurprd02.prod.outlook.com/) + + Last September Henrik Holst reported an issue when trying to compile + Git 2.44.0 with HTTPS/curl support on LFS 12.1. The 'configure' script + failed to detect libcurl's dependencies properly when trying to link + statically. + + The issue occurred because the 'configure' script only used the + `-lcurl` build flag without running `pkg-config --libs libcurl` to + add build flags for dependencies like `zstd` that libcurl + needs. Henrik found that manually setting the LDFLAGS environment + variable to include build flags for all dependencies (like `-lcurl + -lssl -lcrypto -lzstd -lbrotlidec -lz`) allowed the build to + succeed. This sparked a broader discussion about Git's build system + situation. + + Looking at 'configure.ac', Junio Hamano, the Git maintainer, noted + that `pkg-config` isn't used at all, instead `curl-config --libs` is + used to detect curl's flags. Even if the 'configure' script was + added early in the history of the Git project, Junio said it was an + afterthought and nobody has considered "upgrading" from + `curl-config` to `pkg-config` for dependency detection. + + In fact, our own Jakub Narębski + [initially added the 'configure' script](https://lore.kernel.org/git/200607030156.50455.jnareb@gmail.com/) + back in 2006 to make it much easier to create RPM spec files when + compilation follows traditional `configure && make && make install` + steps. + + brian m. carlson replied to Junio that users shouldn't statically + link libcurl or OpenSSL at all, as this creates security issues. + With static linking, security updates to these libraries would + require recompiling Git to take effect. In contrast, dynamic linking + allows security updates to be applied as soon as a new Git process + is spawned. + + Patrick Steinhardt replied to Junio suggesting it might be time to + reconsider Git's three build systems + ([GNU Make](https://www.gnu.org/software/make/), + [Autoconf](https://www.gnu.org/software/autoconf/), and + [CMake](https://cmake.org/)). He proposed potentially dropping + Autoconf and making CMake officially supported, or switching to + [Meson](https://mesonbuild.com/) as an alternative. + + CMake was [added more recently in 2020](https://lore.kernel.org/git/pull.614.git.1587700897.gitgitgadget@gmail.com/) + by Sibi Siddharthan as a third build system with the main goal of + improving the build experience for developers on Windows. + + Soon after Patrick's reply, the Git Contributors' Summit happened + and the + ["Modern Build System" topic](https://lore.kernel.org/git/Zu2E3vIcTzywWOx3@nand.local/) + was discussed there. Patrick Steinhardt raised concerns about + maintaining three different build systems while others were + concerned about having good platform support and good Windows + developer experience. This led to an extensive discussion about + the merits of different build systems in the thread started by + Henrik. + + Eli Schwartz, the Meson maintainer, made a detailed case for + preferring Meson over CMake, citing various CMake pain points and + limitations. Phillip Wood agreed with Patrick about getting rid of + Autoconf, but raised the importance of Visual Studio integration, + since CMake was originally added to improve the Windows developer + experience. Johannes Schindelin, alias Dscho, emphasized that + CMake's deep Visual Studio integration was crucial for Windows + developers and cautioned against switching to alternatives that + would make the Windows experience worse. It appeared that Visual + Studio has Meson support via plugins though, which alleviated some + concerns. + + Paul Smith, the GNU Make maintainer, noted that requiring additional + build tools like Meson, which are not yet often used and require + some other dependencies, like Python3 for Meson, adds friction, + though he acknowledged that for Git specifically this may be less of + a concern given its existing dependencies. + + Junio seemed to agree that adding support for a fourth build system + would be worth it if it would allow the project to drop all other + three build systems eventually. He said the new build system would + have "to be something available widely and easy to learn". + + Patrick came up later in October with a + [21 patch long RFC series](https://lore.kernel.org/git/cover.1727881164.git.ps@pks.im/) + to add support for the Meson build system with the goal of + eventually replacing the current three build systems. + + There were a number of iterations on that series. Among the many + comments, Taylor Blau asked about the eventual goals of the series + and plans for CMake support. He noted that CMake support in contrib/ + was in an awkward position, neither fully supported nor properly + maintained out-of-tree. He was concerned about having to maintain + three build systems simultaneously during any transition period. + + David Aguilar expressed concerns about Python being a dependency + through Meson. Eli replied that muon, a C99 implementation of Meson, + could be used instead and demonstrated it working with Git's build. + + Jeff King, alias Peff, asked about reliability for bisecting and + whether out-of-source builds would work correctly when moving + between commits. He also requested better documentation of common + developer workflows with Meson compared to Make. + + Junio discussed the need to maintain build system compatibility + during any transition period. He noted that many of the Makefile + options were added over time for good reasons and dropping support + for them would need careful consideration. + + A number of other developers participated in the reviews. Ramsay + Jones tested the patches on various platforms including + Cygwin. Phillip Wood reviewed CMake-related changes and provided + technical feedback. Johannes Sixt commented on changes to the + gitk-git subtree. Your own Christian Couder provided feedback on the + documentation. + + Over the iterations, Patrick updated the series to improve + documentation, fix conflicts with in-flight patches, and address the + various technical concerns raised during review. + + Eventually the + [version 11 of the patch series](https://lore.kernel.org/git/20241206-pks-meson-v11-0-525ed4792b88@pks.im/) + was merged and will be part of Git v2.48.0 that should be released + in the next few weeks. It should be a properly supported modern + build system that can be faster and more easily configurable than + the three existing ones which will hopefully get deprecated over + time. + + The merged patch series especially adds + [some documentation](https://lore.kernel.org/git/20241206-pks-meson-v11-24-525ed4792b88@pks.im/#Z31meson.build) + to help build Git with Meson and + [a build system comparison](https://lore.kernel.org/git/20241206-pks-meson-v11-23-525ed4792b88@pks.im/#Z31Documentation:technical:build-systems.txt) + that might be interesting to read. __Git tools and sites__ ++ [bus-factor-explorer](https://github.com/JetBrains-Research/bus-factor-explorer) + by JetBrains Research is a web app for exploring Bus Factor of GitHub projects + by analyzing the commit history. Available as to install as a Docker image. + The repository includes evaluation results for 935 popular repositories on GitHub. + There is also a short video about the tool on YouTube: . + Written in Kotlin (with evaluation done with Jupyter notebooks), under MIT license. + + See [The Bus Factor](https://mclare.blog/posts/the-bus-factor/) and + [The github plugin my coworkers asked me not to write](https://scannedinavian.com/the-github-plugin-my-coworkers-asked-me-not-to-write.html) + articles mentioned in [Git Rev News Edition #117](https://git.github.io/rev_news/2024/11/30/edition-117/) + (the previous edition), together with accompanying links. ++ [Anonymous GitHub](https://anonymous.4open.science/) is a service + that allows you to anonymize your GitHub repository for double-blind scientific review + (of scientific article where source code is to be made available for open science reasons). + Several anonymization options are available to ensure that you do not break the double-anonymize, + such as removing links, images or specific terms. + The goal is to make is as easy as possible for the reviewer to explore and review the repository. ++ [Git.News](https://git.news/) is a website which provides infinite newsfeed of + trending repositories from GitHub, HackerNews & Reddit + (which you can then filter by programming language). ++ [Octobox](https://octobox.io/) is a service to help manage GitHub notifications. + Includes optional GitHub app to add live information on issue, PR, and CI status, labels, authors, etc. + Octobox is free for open source projects with basic notifications for private projects. ++ [Filestash](https://www.filestash.app/) is Dropbox-like enterprise-grade file manager, + connecting your storage with your identity provider and authorisations. + It adds a web interface to storage solutions like S3 buckets, SFTP/FTPS server, Git repositories, etc. + Self-hosted solution is free; it can be done using Docker image. + Written in Go and JavaScript, under AGPLv3 license. + Demo available at , + source code at . ++ [DistGit (Distribution Git)](https://github.com/release-engineering/dist-git) + is Git with additional data storage, designed to hold content of source RPMs + (Linux distribution packages). Written in Python, under the MIT license, + but with scripts/httpd/upload.cgi under GPLv1, + and dist-git-client sub-directory under GPLv2+. ++ [wikmd](https://linbreux.github.io/wikmd/) is a file-based wiki, with + documents written in Markdown, and which uses Git for version control. + It is possible to connect Wikmd with an online repo. + Written in Python, under MIT license. ++ [Mycorrhiza Wiki](https://mycorrhiza.wiki/) is a free and open-source wiki engine, + with data stored as simple files, and changes [stored in Git](https://mycorrhiza.wiki/hypha/git). + It uses [Mycomarkup](https://mycorrhiza.wiki/hypha/mycomarkup), a custom-made markup language, + with support for transcluding units of contents. + Written in Go, under AGPLv3 license. ++ [Gitit](https://github.com/jgm/gitit) is a wiki engine written in Haskell, + that uses [Happstack](http://happstack.com/) (HAppS) for the web server + and [pandoc](http://pandoc.org/) for markup processing (with extended Markdown format as default). + Pages and uploaded files are stored in a git, darcs, or mercurial repository + and may be modified through the wiki's web interface. + Under GPLv2 license. ++ [Xandikos](https://www.xandikos.org/) is a lightweight CardDAV/CalDAV server + that backs onto a Git repository. + It allows to share calendars (events, todo items, journal entries) via CalDAV + and contacts (vCard) via CardDAV. + Written in Python using Dulwich, Jinja2, icalendar, and defusedxml, + licensed under GPLv3+. ++ [Opengist](https://github.com/thomiceli/opengist) is a self-hosted pastebin powered by Git, + similar to [GitHub Gist](https://gist.github.com/). + Demo available at . + Written in Go, under AGPLv3 license. ++ [rgit](https://github.com/w4/rgit) is a gitweb/cgit-like fast web frontend for git repositories. + You can see it in action at . + Written in Rust using Axum, gitoxide, Askama and RocksDB. + Under WTFPL license + (which is not on the list of [OSI approved Licenses](https://opensource.org/licenses), + but is on the list of [licenses that meet Debian Free Software Guidelines](https://wiki.debian.org/DFSGLicenses#DO_WHAT_THE_FUCK_YOU_WANT_TO_PUBLIC_LICENSE)). ++ [klaus](https://github.com/jonashaag/klaus) is a simple, easy-to-set-up Git web viewer. + Supports syntax highlighting, Markdown + RestructuredText (reST) rendering support, + and code navigation using Exuberant ctags. Can be installed as Docker image of via `pip`. + You can see its demo at . + Written in Python, under unamed custom permissive license. ++ [git-activity](https://git-activity.olets.dev/) is a tool + to record your Git activity across multiple (or all) repos, + and read it optionally filtered by date, + activity type (e.g. commit, branch creation, etc) regex pattern, + repo name regex pattern, branch name regex pattern, commit message regex pattern, + and/or commit SHA (first seven characters) regex pattern. + Useful for retroactively filling out a time sheet (or correcting a time sheet), + finding that time you solved a problem similar to the one you're working on now, etc. + The log is stored in a plain text file. Source code [on GitHub](https://github.com/olets/git-activity). + Written as bash shell script using AWK, licensed under (custom) + CC BY-NC-SA 4.0 with Hippocratic License v3 ethical requirements. ++ [git-branches-script](https://github.com/conorsheppard/git-branches-script) + is a convenience script that prints a menu of recent git branches + and allows you to switch to a new branch by selecting its corresponding number. + Written as bash shell script, no license provided. + ## Releases From c789c285c333afb265c30588db7cdc709b9dab19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Nar=C4=99bski?= Date: Tue, 31 Dec 2024 15:07:43 +0100 Subject: [PATCH 058/227] rn-118: Add a few links and one clarification to the Meson article --- rev_news/drafts/edition-118.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/rev_news/drafts/edition-118.md b/rev_news/drafts/edition-118.md index b2578a8ca..5e236326f 100644 --- a/rev_news/drafts/edition-118.md +++ b/rev_news/drafts/edition-118.md @@ -52,7 +52,8 @@ This edition covers what happened during the months of November and December 202 In fact, our own Jakub Narębski [initially added the 'configure' script](https://lore.kernel.org/git/200607030156.50455.jnareb@gmail.com/) - back in 2006 to make it much easier to create RPM spec files when + back in 2006 to make it much easier to create RPM spec file for Git. + Creating `*.spec` file is especially easy when the compilation follows traditional `configure && make && make install` steps. @@ -121,7 +122,8 @@ This edition covers what happened during the months of November and December 202 three build systems simultaneously during any transition period. David Aguilar expressed concerns about Python being a dependency - through Meson. Eli replied that muon, a C99 implementation of Meson, + through Meson. Eli replied that [muon](https://github.com/muon-build/muon), + a C99 implementation of Meson, could be used instead and demonstrated it working with Git's build. Jeff King, alias Peff, asked about reliability for bisecting and @@ -155,10 +157,13 @@ This edition covers what happened during the months of November and December 202 The merged patch series especially adds [some documentation](https://lore.kernel.org/git/20241206-pks-meson-v11-24-525ed4792b88@pks.im/#Z31meson.build) + (via comments in [`meson.build`](https://git.kernel.org/pub/scm/git/git.git/tree/meson.build)) to help build Git with Meson and [a build system comparison](https://lore.kernel.org/git/20241206-pks-meson-v11-23-525ed4792b88@pks.im/#Z31Documentation:technical:build-systems.txt) + (in [`Documentation/technical/build-systems.txt`](https://git.kernel.org/pub/scm/git/git.git/tree/Documentation/technical/build-systems.txt)) that might be interesting to read. + From 3cf8bf0a600759653e1c2ed51b90e075933c6f6d Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 1 Jan 2025 11:19:45 +0100 Subject: [PATCH 059/227] rn-118: add Outreachy interns small article --- rev_news/drafts/edition-118.md | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/rev_news/drafts/edition-118.md b/rev_news/drafts/edition-118.md index 5e236326f..5d54648dc 100644 --- a/rev_news/drafts/edition-118.md +++ b/rev_news/drafts/edition-118.md @@ -17,9 +17,29 @@ This edition covers what happened during the months of November and December 202 ## Discussions - + +- Git participates in [Outreachy's December 2024 to March 2025 round](https://www.outreachy.org/alums/2024-12/): + + - Seyi Kuforiji is working on the "Convert unit tests to use the + clar testing framework" project. He is mentored by Patrick + Steinhardt and Phillip Wood and posting updates [on his gitlab.io blog](https://seyi-kuforiji-902b48.gitlab.io/posts/index.html) + while his work is on [his GitHub repository](https://github.com/Seyi007/git). + + - Usman Akinyemi is working on the "Finish adding a 'os-version' + capability to Git protocol v2" project. He is mentored by + Christian Couder and posting updates [on his hashnode.dev blog](https://uniqueusman.hashnode.dev/) + while his work is on [his GitLab repository](https://gitlab.com/Unique-Usman/git/-/branches). + + Congratulations to Usman and Seyi for being selected! + + We are still looking for corporate sponsors to fund these two + Outreachy internship. Thank you in advance for contacting the Git + PLC (git@sfconservancy.org) if you are interested. + + Many thanks also to the other contributors who applied and worked on + micro-projects, but couldn’t be selected! We hope to continue to see + you in the community! + + + + + + + +## Other News + +__Various__ + + +__Light reading__ + + + +__Git tools and sites__ + + +## Releases + + +## Credits + +This edition of Git Rev News was curated by +Christian Couder <>, +Jakub Narębski <>, +Markus Jansen <> and +Kaartic Sivaraam <> +with help from XXX. From f163a9623d0581d7f70c3df2f0e698fa36e0b115 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Thu, 2 Jan 2025 12:06:52 +0100 Subject: [PATCH 067/227] =?UTF-8?q?rn-118:=20add=20=C5=A0t=C4=9Bp=C3=A1n?= =?UTF-8?q?=20N=C4=9Bmec=20among=20the=20helpers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _posts/2024-12-31-edition-118.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/2024-12-31-edition-118.markdown b/_posts/2024-12-31-edition-118.markdown index 40e865d80..9d801a4ef 100644 --- a/_posts/2024-12-31-edition-118.markdown +++ b/_posts/2024-12-31-edition-118.markdown @@ -422,4 +422,4 @@ Christian Couder <>, Jakub Narębski <>, Markus Jansen <> and Kaartic Sivaraam <> -with help from XXX. +with help from Štěpán Němec. From 8f48ec1d5fb71f1cea2761175f7fb15c480a1d78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Nar=C4=99bski?= Date: Thu, 2 Jan 2025 15:46:46 +0100 Subject: [PATCH 068/227] rn-118: Very minor fixup --- _posts/2024-12-31-edition-118.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/2024-12-31-edition-118.markdown b/_posts/2024-12-31-edition-118.markdown index 9d801a4ef..1e488a8f4 100644 --- a/_posts/2024-12-31-edition-118.markdown +++ b/_posts/2024-12-31-edition-118.markdown @@ -365,7 +365,7 @@ __Git tools and sites__ but is on the list of [licenses that meet Debian Free Software Guidelines](https://wiki.debian.org/DFSGLicenses#DO_WHAT_THE_FUCK_YOU_WANT_TO_PUBLIC_LICENSE)). + [klaus](https://github.com/jonashaag/klaus) is a simple, easy-to-set-up Git web viewer. Supports syntax highlighting, Markdown + RestructuredText (reST) rendering support, - and code navigation using Exuberant ctags. Can be installed as Docker image of via `pip`. + and code navigation using Exuberant ctags. Can be installed as Docker image or via `pip`. You can see its demo at . Written in Python, under an unnamed custom permissive license. + [git-activity](https://git-activity.olets.dev/) is a tool From 22d41c570fa8f6ff6f466b821e96d4b19c24c287 Mon Sep 17 00:00:00 2001 From: Kaartic Sivaraam Date: Thu, 23 Jan 2025 01:14:15 +0530 Subject: [PATCH 069/227] rn-119: include interview with Justin Tobler --- rev_news/drafts/edition-119.md | 75 ++++++++++++++++++++++++++++++++-- 1 file changed, 72 insertions(+), 3 deletions(-) diff --git a/rev_news/drafts/edition-119.md b/rev_news/drafts/edition-119.md index ba9be5488..43e58db06 100644 --- a/rev_news/drafts/edition-119.md +++ b/rev_news/drafts/edition-119.md @@ -29,9 +29,78 @@ This edition covers what happened during the months of December 2024 and January ### Support --> - +## Developer Spotlight: Justin Tobler + +* Who are you and what do you do? + + My name is Justin Tobler and I am a relatively new contributor to the + Git project with my first contributions being made this last year. I + work at GitLab and these days spend my time integrating Git into + GitLab's data access layer as well as upstreaming Git fixes/features. + +* What would you name your most important contribution to Git? + + Most of my contributions thus far have been relatively minor bug fixes, + but [one bug I found](https://public-inbox.org/git/pull.1683.git.1709669025722.gitgitgadget@gmail.com/) + particularly interesting was with the table compaction algorithm in the + new reftable reference backend. There was a theoretical scenario where + certain Git operations could be performed and new tables written, but + table compaction would never occur. This was found when tests on certain + platforms started failing because of file descriptor limits being exceeded. + +* What are you doing on the Git project these days, and why? + + One topic I'm currently working on is introducing a way to + [generate batches of specific blob diffs](https://public-inbox.org/git/20241213042312.2890841-1-jltobler@gmail.com/). + This is not particularly useful for users, but for Git servers + it's a nice feature. + + I still have much to learn about the project so I also enjoy looking + into the inflight topics that pop on the mailing list. + +* If you could remove something from Git without worrying about + backwards compatibility, what would it be? + + I don't have anything specific in mind, but it would probably be along + the lines of changes to make the Git CLI more consistent across its + various commands. + +* What is your favorite Git-related tool/library, outside of + Git itself? + + For my Git-related workflow, outside of GitLab, I primarily use the Git + CLI for everything. + +* What is your toolbox for interacting with the mailing list and for + development of Git? + + For interacting with the mailing list my workflow primarily consists of + using [`neomutt`](https://neomutt.org/guide/gettingstarted.html) + and `git send-email`, but I have also recently been + exploring [`b4`](https://github.com/mricon/b4). + + For development, I use [`neovim`](https://neovim.io) as my editor with + an assortment of plugins. + +* What is your advice for people who want to start Git development? + Where and how should they start? + + If you are unfamiliar with the mailing workflow, [GitGitGadget](https://gitgitgadget.github.io/) + can help handle formatting patches and sending them off to the mailing + list. My first couple of patch series used this tool and I found it + useful to get started without having to be super familiar with + `git format-patch` and `git send-email`. Other than that, I also + find it very helpful to observe how other contributors submit + patches and interact on the mailing list. + +* If there's one tip you would like to share with other Git + developers, what would it be? + + I appreciate when the authors of a patch series provide as much + background as possible to the change being made. Reading incoming patch + series is a great way to learn about the project and it is very helpful + when the required context overhead is minimized. + ## Other News From cf48ac87d45233d3accddd64c24f0870c43bcb60 Mon Sep 17 00:00:00 2001 From: Kaartic Sivaraam Date: Thu, 23 Jan 2025 01:14:58 +0530 Subject: [PATCH 070/227] rn-119: remove unnecessary trailing space --- rev_news/drafts/edition-119.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-119.md b/rev_news/drafts/edition-119.md index 43e58db06..047a59052 100644 --- a/rev_news/drafts/edition-119.md +++ b/rev_news/drafts/edition-119.md @@ -91,7 +91,7 @@ This edition covers what happened during the months of December 2024 and January useful to get started without having to be super familiar with `git format-patch` and `git send-email`. Other than that, I also find it very helpful to observe how other contributors submit - patches and interact on the mailing list. + patches and interact on the mailing list. * If there's one tip you would like to share with other Git developers, what would it be? From f7e86cdfcf4c40042655b803458b3a42244d7f7d Mon Sep 17 00:00:00 2001 From: Kaartic Sivaraam Date: Mon, 27 Jan 2025 12:12:57 +0530 Subject: [PATCH 071/227] SoC-2025: include initial draft of ideas list The ideas were suggested by Patrick on the mailing list. Ref: https://public-inbox.org/git/Z432QXJb_TfzNBa2@pks.im/ --- SoC-2024-Ideas.md | 1 + SoC-2025-Ideas.md | 118 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 119 insertions(+) create mode 100644 SoC-2025-Ideas.md diff --git a/SoC-2024-Ideas.md b/SoC-2024-Ideas.md index 579a76042..56cc38a44 100644 --- a/SoC-2024-Ideas.md +++ b/SoC-2024-Ideas.md @@ -1,6 +1,7 @@ --- layout: default title: SoC 2024 Ideas +navbar: false --- ![git logo >](https://git-scm.com/images/logos/downloads/Git-Logo-2Color.svg) diff --git a/SoC-2025-Ideas.md b/SoC-2025-Ideas.md new file mode 100644 index 000000000..3ae5411bd --- /dev/null +++ b/SoC-2025-Ideas.md @@ -0,0 +1,118 @@ +--- +layout: default +title: SoC 2024 Ideas +navbar: false +--- + +![git logo >](https://git-scm.com/images/logos/downloads/Git-Logo-2Color.svg) + +This is the idea page for Summer of Code 2025 for Git. + +*Please completely read the [general application information](https://git.github.io/General-Application-Information) +page before reading the idea list below.* + +## Summer of code main project ideas + +**Students**: Please consider these ideas as starting points for +generating proposals. We are also more than happy to receive proposals +for other ideas related to Git. Make sure you have read the "Note +about refactoring projects versus projects that implement new +features" in the [general application information](https://git.github.io/General-Application-Information) +page though. + +### Note about limit of project selection + +Kindly note that considering the bandwidth of available mentors, the +Git project would only mentor up to 2 contributors this year. + +This is not a hard and fast rule. It may change if more community members are +willing to mentor in the coming days. For instance, this may happen when +a new project is proposed and some community member volunteers to mentor +the same. + + +### Consolidate ref-related functionality into git-refs + +This project aims to streamline Git's reference management into the existing +`git-refs` command by consolidating functionality currently spread +across multiple commands. The new command will provide subcommands for listing, +getting, checking existence, writing, and optimizing references, replacing the +functionality currently handled by git-update-ref(1), git-for-each-ref(1), +git-show-ref(1), and git-pack-refs(1). + +The consolidation work should ensure backward compatibility with existing +commands. The work involves C programming in Git's codebase, creating +comprehensive tests, and updating documentation. + +Required skills include C programming, familiarity with Git's codebase, and experience with command-line tool development. The project is expected to take 12 weeks, with existing commands being maintained for backward compatibility while development focuses on the new unified interface. + +Getting started: Build Git from source, study the existing ref-related commands, and submit a micro-patch to demonstrate familiarity with the codebase. + +_Expected Project Size_: 175 hours or 350 hours + +_Difficulty_: Medium + +_Languages_: C, shell(bash) + +_Possible mentors_: + +* Patrick Steinhardt < > +* Jialuo She < > + + +### Refactoring in order to reduce Git's global state + +This project focuses on modernizing Git's environment handling by refactoring +the `environment.c` code to reduce global state. The goal is to move environment +variables and configuration from global scope into more appropriate local +contexts, primarily into the `struct repository` / `struct repository_settings` +structure. This architectural improvement will make the codebase more +maintainable and potentially enable better multi-repository handling in the +future. The project involves careful refactoring of Git's core environment +handling code, requiring strong C programming skills and attention to detail. + +The student will identify global variables that can be moved to local scope, +implement the necessary structural changes, and ensure all affected code paths +continue to work correctly. This includes updating tests, fixing any +regressions, and documenting the architectural changes. + +_Expected Project Size_: 90 or 175 hours or 350 hours + +_Difficulty_: Medium + +_Languages_: C, shell(bash) + +_Possible mentors_: + +* Patrick Steinhardt < > + + +### Machine-Readable Repository Information Query Tool + +This project aims to create a new Git command dedicated to querying repository +metadata and configuration in a structured, machine-readable format. Currently, +much of this functionality exists within git-rev-parse(1), which has evolved +beyond its original purpose. The new command will provide a cleaner, more +focused interface for programmatically accessing repository information using +JSON output. + +The student will design and implement this new command, focusing on identifying +what repository information should be exposed, designing a consistent JSON +schema, and implementing the necessary interfaces to Git's internal APIs. Key +challenges include determining which subset of information from git-rev-parse to +expose via this new command, ensuring backward compatibility, and creating a +clean, well-documented command interface that's useful for scripts and tools. + +While this is an exploratory project that hasn't been extensively discussed in +the Git community, it addresses a real need for better programmatic access to +repository information. + +_Expected Project Size_: 175 hours or 350 hours + +_Difficulty_: Medium + +_Languages_: C, shell(bash) + +_Possible mentors_: + +* Patrick Steinhardt < > From 5a34f2ab33b4bf55e175cacd7f35e72653d3c52c Mon Sep 17 00:00:00 2001 From: Kaartic Sivaraam Date: Mon, 27 Jan 2025 12:17:18 +0530 Subject: [PATCH 072/227] SoC-2025: make the ideas list visible --- SoC-2025-Ideas.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/SoC-2025-Ideas.md b/SoC-2025-Ideas.md index 3ae5411bd..124fc2808 100644 --- a/SoC-2025-Ideas.md +++ b/SoC-2025-Ideas.md @@ -1,7 +1,6 @@ --- layout: default -title: SoC 2024 Ideas -navbar: false +title: SoC 2025 Ideas --- ![git logo >](https://git-scm.com/images/logos/downloads/Git-Logo-2Color.svg) From 09f1ba6fcfa363ad67a6e502ebeb77d3f458deef Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Tue, 28 Jan 2025 12:51:01 +0000 Subject: [PATCH 073/227] rn-119: Link to Boost Your Git DX second update --- rev_news/drafts/edition-119.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rev_news/drafts/edition-119.md b/rev_news/drafts/edition-119.md index 047a59052..1e68437a5 100644 --- a/rev_news/drafts/edition-119.md +++ b/rev_news/drafts/edition-119.md @@ -106,6 +106,10 @@ This edition covers what happened during the months of December 2024 and January __Various__ +* Adam Johnson’s book “Boost Your Git DX” + [has been updated](https://adamj.eu/tech/2025/01/28/bygdx-second-update/) + with 28 new pages of content. This book was first mentioned in + [Git Rev News Edition #104](https://git.github.io/rev_news/2023/10/31/edition-104/). __Light reading__ From 33ec2295541e5209adf37986482ffd0c999a7699 Mon Sep 17 00:00:00 2001 From: Kaartic Sivaraam Date: Tue, 28 Jan 2025 23:48:22 +0530 Subject: [PATCH 074/227] SoC=2025: include project about dumpt HTTP transport --- SoC-2025-Ideas.md | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/SoC-2025-Ideas.md b/SoC-2025-Ideas.md index 124fc2808..ae3b86cb7 100644 --- a/SoC-2025-Ideas.md +++ b/SoC-2025-Ideas.md @@ -115,3 +115,45 @@ _Languages_: C, shell(bash) _Possible mentors_: * Patrick Steinhardt < > + + +### Implement support for reftables in "dumb" HTTP transport + +Fetching Git repositories uses one of two major protocols: + + - The "dumb" protocol works without requiring any kind of + interactive negotiation like a CGI module. It can thus + be served by a static web server. + + - The "smart" protocol works by having the client and + server exchange multiple messages with each other. It is + more efficient, but requires support for Git in the + server. + +While almost all servers nowadays use the "smart" protocol, +there are still some that use the "dumb" protocol. + +The "dumb" protocol cannot serve repositories which use the +"reftable" backend though. While there exists a "info/refs" +file that is supposed to be backend-agnostic, this file does +not contain information about the default branch. Instead, +clients are expected to download the "HEAD" file and derive +the default branch like that. This file is a mere stub in +the "reftable" backend though, which breaks this protocol. + +The goal of this project is to implement "reftable" support +for "dumb" fetches. + +See: + + - + +_Expected Project Size_: 175 hours or 350 hours + +_Difficulty_: Medium + +_Languages_: C, shell(bash) + +_Possible mentors_: +* Patrick Steinhardt < > +* Karthik Nayak < > From 601bf85e7b8a26dd6d089441a7d711a4021a4693 Mon Sep 17 00:00:00 2001 From: Kaartic Sivaraam Date: Thu, 30 Jan 2025 11:03:07 +0530 Subject: [PATCH 075/227] SoC-2025: integrate microproject ideas Related thread: https://public-inbox.org/git/Z5d_XbPfQQBnwgQf@ArchLinux/T/#m966de0eab8f454b40677086cf41032116f72cce6 --- SoC-2024-Microprojects.md | 1 + SoC-2025-Microprojects.md | 208 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 209 insertions(+) create mode 100644 SoC-2025-Microprojects.md diff --git a/SoC-2024-Microprojects.md b/SoC-2024-Microprojects.md index b0765bebd..c832f49f3 100644 --- a/SoC-2024-Microprojects.md +++ b/SoC-2024-Microprojects.md @@ -1,6 +1,7 @@ --- layout: default title: SoC 2024 Applicant Microprojects +navbar: false --- ## Introduction diff --git a/SoC-2025-Microprojects.md b/SoC-2025-Microprojects.md new file mode 100644 index 000000000..a8b820c17 --- /dev/null +++ b/SoC-2025-Microprojects.md @@ -0,0 +1,208 @@ +--- +layout: default +title: SoC 2025 Applicant Microprojects +--- + +## Introduction + +First make sure you read and understand +[our general guidelines and suggestions for microprojects](https://git.github.io/General-Microproject-Information). + +There are some suggestions on how you can find some microprojects on your own in the document. + +## Ideas for microprojects + +### Fix Sign Comparison Warnings in Git's Codebase + +Help improve Git's code quality by fixing sign comparison warnings in files that +currently disable these warnings. The goal is to remove instances of +`DISABLE_SIGN_COMPARE_WARNINGS` macro and fix the underlying issues properly. + +#### Steps to Complete +1. Find a C source file that contains `#define DISABLE_SIGN_COMPARE_WARNINGS` +2. Remove this #define +3. Build Git with `DEVELOPER=1` to enable compiler warnings. The `DEVLEOPER` + can be specified in your `config.mak` or as follows + + ```sh + make DEVELOPER=1 -j4 + ``` + +4. Fix all `-Wsign-compare` warnings that appear for that file: + - Pay attention to comparisons between signed and unsigned integers + - Modify variable types or add appropriate casts as needed + - Ensure the fixes don't change the code's behavior + +#### Notes +- Each file should be handled in a separate patch +- Follow Git's commit message conventions +- Test your changes thoroughly +- This is part of an ongoing effort to enable `-Wsign-compare` globally + +#### Related Patches +For context on why this is a crucial improvement to Git's codebase, checkout +[this e-mail](https://public-inbox.org/git/20241206-pks-sign-compare-v4-0-0344c6dfb219@pks.im/) +by Patrick Steinhardt. + + +### Modernize Test Path Checking in Git's Test Suite + +Help improve Git's test suite by converting old-style path checks to use modern +helper functions. We'll be replacing basic shell test commands like `test -f` +with Git's dedicated test helpers like `test_path_is_file`. + +#### Steps to Complete +1. Find a test script using old-style path checks: +```sh +git grep "test -[efd]" t/ +``` + +2. Look for patterns like: +```sh +test -f path/to/file # old way +test_path_is_file path/to/file # new way + +test -d some/directory # old way +test_path_is_dir some/directory # new way +``` + +3. Important: Only replace checks that are actually testing for conditions, not + those used in flow control. For example: +```sh +# DON'T change this - it's flow control +if test -e "file.txt"; then + do_something +fi + +# DO change this - it's a test assertion +test -e "file.txt" || error "file.txt should exist" +``` + +#### Notes +- Start small: Pick a test file with just a few instances to convert +- Run the test suite after your changes to ensure nothing breaks +- Follow Git's commit message style +- Include which command you used to find the instances in your commit message + +#### Need Help? +- Reference [this discussion](https://public-inbox.org/git/CAPig+cRfO8t1tdCL6MB4b9XopF3HkZ==hU83AFZ38b-2zsXDjQ@mail.gmail.com/) + for detailed examples. +- If you can't find any instances to fix, let us know what search command you + used + + +### Add more builtin patterns for userdiff + +"git diff" shows the function name corresponding to each hunk after +the @@ ... @@ line. For common languages (C, HTML, Ada, Matlab, ...), +the way to find the function name is built-in Git's source code as +regular expressions (see userdiff.c). A few languages are common +enough to deserve a built-in driver, but are not yet recognized. For +example, shell. + +This project requires a very good knowledge of regular expressions. + +It is easy though to find examples of how this can be done by +searching the code base and the mailing list archive, as this has +already been done for a number of languages. + +### Replace a run_command*() call by direct calls to C functions + +See for example what Junio did in +[ffcb4e94d3](https://github.com/git/git/commit/ffcb4e94d3) (bisect: do +not run show-branch just to show the current commit, 2021-07-27). + +If you can't find one please tell us, along with the command you used +to search, so that we can remove this microproject idea. + +### Avoid suppressing `git`'s exit code in test scripts + +The Git project uses a large collection of integration tests written in +Shell to guard against regressions when adding new features or fixing +bugs. The scripts in question can be found in the `t` directory +[here][git-t]. + +While it is perfectly OK to use [pipes][wikipedia-pipes] when writing +integration tests, we must be careful to avoid writing a pipeline that +suppresses the exit code of a Git process, like so: + +``` +git | +``` + +...since the exit code of `git ` would be suppressed by the +pipe. If `git ` crashed, we would not catch it in the above +example when running the integration suite. + +Other examples to avoid include: + +``` +# bad: + $(git ) + +# also bad: + <) +EOF +``` + +...since the exit code of `git ` is hidden behind the +subshell in both instances. + +On the other hand, both of the following examples are OK, since neither +hides the exit code of running `git `: + +``` +# good: +var=$(git ) + +# also good: + | | git +``` + +(provided that neither `` or `` are +`git`). + +See the commit +[c6f44e1da5](https://github.com/git/git/commit/c6f44e1da5e88e34) +for example, and then do the same thing in one other test script. + +If you can't find one please tell us, along with the command you used +to search, so that we can remove this microproject idea. + +[git-t]: https://github.com/git/git/tree/master/t +[wikipedia-pipes]: https://en.wikipedia.org/wiki/Pipeline_(Unix) + +### Use unsigned integral type for collection of bits. + +Pick one field of a structure that (1) is of signed integral type and (2) is +used as a collection of multiple bits. Discuss if there is a good reason +why it has to be a signed integral field and change it to an unsigned +type otherwise. [[thread](https://public-inbox.org/git/xmqqsiebrlez.fsf@gitster.dls.corp.google.com)] + +Even though the amount of code to write is small, these projects +involve a lot of prior work to understand the specification and deal +with all potential corner-cases. + +### Modernize a test script + +A number of our test scripts have been written a long time ago in a +style that is now outdated. + +In the following email it is explained in details how to modernize and +clean up the t7001 test script: + + + +t7001 is not the only test script where similar changes could be made +though. + +Find one test script that needs some of the same changes and make +them. Please make sure that the test script is not already being +worked on by asking on the mailing list before starting to work on it. + +There should be only one kind of change per commit. For example if one +of your commits indents test bodies with TABs, instead of spaces, then +this should be the only kind of change in this commit. + From 61088311c3b121493d2de8a41467386106c466fa Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Thu, 30 Jan 2025 10:50:56 +0100 Subject: [PATCH 076/227] rn-119: add releases --- rev_news/drafts/edition-119.md | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/rev_news/drafts/edition-119.md b/rev_news/drafts/edition-119.md index 1e68437a5..4790fd21a 100644 --- a/rev_news/drafts/edition-119.md +++ b/rev_news/drafts/edition-119.md @@ -122,6 +122,32 @@ __Git tools and sites__ ## Releases ++ Git [2.48.1 and friends](https://public-inbox.org/git/xmqq5xmh46oc.fsf@gitster.g/), +[2.48.0](https://public-inbox.org/git/xmqqplku7cvm.fsf@gitster.g/), +[2.48.0-rc2](https://public-inbox.org/git/xmqqbjwjyalr.fsf@gitster.g/) ++ Git for Windows [2.48.0-rc2(1)](https://github.com/git-for-windows/git/releases/tag/v2.48.0-rc2.windows.1) ++ GitLab [17.8.1](https://about.gitlab.com/releases/2025/01/22/patch-release-gitlab-17-8-1-released/), +[17.8](https://about.gitlab.com/releases/2025/01/16/gitlab-17-8-released/), +[17.7.2](https://about.gitlab.com/releases/2025/01/15/gitlab-17-7-2-released/), +[17.7.1](https://about.gitlab.com/releases/2025/01/08/patch-release-gitlab-17-7-1-released/) ++ Gerrit Code Review [3.10.4](https://www.gerritcodereview.com/3.10.html#3104), +[3.11.1](https://www.gerritcodereview.com/3.11.html#3111), +[3.9.9](https://www.gerritcodereview.com/3.9.html#399) ++ GitHub Enterprise [3.15.2](https://help.github.com/enterprise-server@3.15/admin/release-notes#3.15.2), +[3.14.7](https://help.github.com/enterprise-server@3.14/admin/release-notes#3.14.7), +[3.13.10](https://help.github.com/enterprise-server@3.13/admin/release-notes#3.13.10), +[3.12.14](https://help.github.com/enterprise-server@3.12/admin/release-notes#3.12.14) ++ GitKraken [10.6.3](https://help.gitkraken.com/gitkraken-client/current/), +[10.6.2](https://help.gitkraken.com/gitkraken-client/current/), +[10.6.1](https://help.gitkraken.com/gitkraken-client/current/) ++ GitHub Desktop [3.4.15](https://desktop.github.com/release-notes/), +[3.4.14](https://desktop.github.com/release-notes/), +[3.4.13](https://desktop.github.com/release-notes/) ++ Garden [2.0.0](https://github.com/garden-rs/garden/releases/tag/v2.0.0), +[1.10.1](https://github.com/garden-rs/garden/releases/tag/v1.10.1) ++ Git Cola [4.11.0](https://github.com/git-cola/git-cola/releases/tag/v4.11.0) ++ GitButler [0.14.6](https://github.com/gitbutlerapp/gitbutler/releases/tag/release/0.14.6), +[0.14.5](https://github.com/gitbutlerapp/gitbutler/releases/tag/release/0.14.5) ## Credits From 656797355c51b36fd8334e04747b424e7f5cb43d Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Thu, 30 Jan 2025 11:14:26 +0100 Subject: [PATCH 077/227] rn-119: add Justin Tobler among the helpers --- rev_news/drafts/edition-119.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-119.md b/rev_news/drafts/edition-119.md index 4790fd21a..793819a7c 100644 --- a/rev_news/drafts/edition-119.md +++ b/rev_news/drafts/edition-119.md @@ -156,4 +156,4 @@ Christian Couder <>, Jakub Narębski <>, Markus Jansen <> and Kaartic Sivaraam <> -with help from XXX. +with help from Justin Tobler. From 4dc93d6e35d17eec4af39c0b8703494f7a163366 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Thu, 30 Jan 2025 11:15:49 +0100 Subject: [PATCH 078/227] rn-119: add Adam Johnson among the helpers --- rev_news/drafts/edition-119.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-119.md b/rev_news/drafts/edition-119.md index 793819a7c..9c2d9d284 100644 --- a/rev_news/drafts/edition-119.md +++ b/rev_news/drafts/edition-119.md @@ -156,4 +156,4 @@ Christian Couder <>, Jakub Narębski <>, Markus Jansen <> and Kaartic Sivaraam <> -with help from Justin Tobler. +with help from Justin Tobler and Adam Johnson. From c2a4a91203d1aea6099af7e7ba44c4e5a4ef8314 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Thu, 30 Jan 2025 11:52:00 +0100 Subject: [PATCH 079/227] rn-119: improve releases --- rev_news/drafts/edition-119.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/rev_news/drafts/edition-119.md b/rev_news/drafts/edition-119.md index 9c2d9d284..c5b1d3ac8 100644 --- a/rev_news/drafts/edition-119.md +++ b/rev_news/drafts/edition-119.md @@ -122,14 +122,15 @@ __Git tools and sites__ ## Releases -+ Git [2.48.1 and friends](https://public-inbox.org/git/xmqq5xmh46oc.fsf@gitster.g/), ++ Git [2.48.1 and friends (security releases)](https://public-inbox.org/git/xmqq5xmh46oc.fsf@gitster.g/), [2.48.0](https://public-inbox.org/git/xmqqplku7cvm.fsf@gitster.g/), [2.48.0-rc2](https://public-inbox.org/git/xmqqbjwjyalr.fsf@gitster.g/) -+ Git for Windows [2.48.0-rc2(1)](https://github.com/git-for-windows/git/releases/tag/v2.48.0-rc2.windows.1) -+ GitLab [17.8.1](https://about.gitlab.com/releases/2025/01/22/patch-release-gitlab-17-8-1-released/), ++ Git for Windows [2.47.1(2) (security release)](https://github.com/git-for-windows/git/releases/tag/v2.47.1.windows.2) +[2.48.0-rc2(1)](https://github.com/git-for-windows/git/releases/tag/v2.48.0-rc2.windows.1) ++ GitLab [17.8.1, 17.7.3, 17.6.4](https://about.gitlab.com/releases/2025/01/22/patch-release-gitlab-17-8-1-released/), [17.8](https://about.gitlab.com/releases/2025/01/16/gitlab-17-8-released/), [17.7.2](https://about.gitlab.com/releases/2025/01/15/gitlab-17-7-2-released/), -[17.7.1](https://about.gitlab.com/releases/2025/01/08/patch-release-gitlab-17-7-1-released/) +[17.7.1, 17.6.3, 17.5.5](https://about.gitlab.com/releases/2025/01/08/patch-release-gitlab-17-7-1-released/) + Gerrit Code Review [3.10.4](https://www.gerritcodereview.com/3.10.html#3104), [3.11.1](https://www.gerritcodereview.com/3.11.html#3111), [3.9.9](https://www.gerritcodereview.com/3.9.html#399) From 37fde0a229e876ef85b67b93ec9c37e862108f49 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Thu, 30 Jan 2025 22:08:16 +0100 Subject: [PATCH 080/227] rn-119: add xattrs storage article --- rev_news/drafts/edition-119.md | 44 ++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/rev_news/drafts/edition-119.md b/rev_news/drafts/edition-119.md index c5b1d3ac8..ea72c0e65 100644 --- a/rev_news/drafts/edition-119.md +++ b/rev_news/drafts/edition-119.md @@ -25,9 +25,49 @@ This edition covers what happened during the months of December 2024 and January ### Reviews --> - + ++ [git support for "xattrs" (extended filesystem attributes)?](https://lore.kernel.org/git/5b4c09a9-64bb-e672-e604-120563fc1ad6@das-werkstatt.com/) + + Peter B. asked in the Git mailing list if there was a way to store + [extended attributes (xattrs)](https://en.wikipedia.org/wiki/Extended_file_attributes) + in Git. His use case was professional archival collection and he + needed bit-proof preservation of all xattrs, even larger ones. + + Junio Hamano, the Git maintainer, replied that Git only tracks + "contents, pathnames where these contents are stored, and the + executable bit". + + Peff, alias Jeff King, also replied to Peter confirming that Git, + like most other version control systems, doesn't store most + metadata, but pointing to other tools, + [etckeeper](https://etckeeper.branchable.com/) and + [metastore](https://github.com/przemoc/metastore), that can help + with storing that in a separate file and restoring it on checkout. + + Junio agreed with Peff that Git is extensible that way. + + brian m. carlson replied to Peter mentioning other + possibilities. One is to use the `.gitattributes` files to store a + few xattrs with values that are "well stored as text", and then + `git ls-attr` and a `post-checkout` + [hook](https://git-scm.com/book/ms/v2/Customizing-Git-Git-Hooks) + to restore them. + + Another possibility is to use + [mtree](https://linux.die.net/man/8/mtree) utilities to store or + restore metadata from or into mtree files. brian especially pointed + to [go-mtree](https://github.com/vbatts/go-mtree) which supports + xattrs. As `mtree` is an extensible key-value format, brian uses it + to store the install location of his + [dotfiles](https://en.wikipedia.org/wiki/Hidden_file_and_hidden_directory). + + Peter replied to brian thanking everyone for the suggestions and + saying he would especially take a look at `mtree` and + `metastore`. He thanked again brian later saying that `go-mtree` + looked very promising and that he was going to look at + `post-checkout` hooks. ## Developer Spotlight: Justin Tobler From 6bb60ea281a37c8cf1ebdba06dc8b0f1c7ae6b57 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Thu, 30 Jan 2025 22:19:45 +0100 Subject: [PATCH 081/227] rn-119: add D. Ben Knoble among the helpers --- rev_news/drafts/edition-119.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-119.md b/rev_news/drafts/edition-119.md index ea72c0e65..2c77c576d 100644 --- a/rev_news/drafts/edition-119.md +++ b/rev_news/drafts/edition-119.md @@ -197,4 +197,4 @@ Christian Couder <>, Jakub Narębski <>, Markus Jansen <> and Kaartic Sivaraam <> -with help from Justin Tobler and Adam Johnson. +with help from Justin Tobler, D. Ben Knoble and Adam Johnson. From 0714abac8f8d5927a12f0446ff4282a433045c46 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Thu, 30 Jan 2025 22:20:50 +0100 Subject: [PATCH 082/227] rn-119: add Brandon Pugh among the helpers --- rev_news/drafts/edition-119.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-119.md b/rev_news/drafts/edition-119.md index 2c77c576d..da912fd6c 100644 --- a/rev_news/drafts/edition-119.md +++ b/rev_news/drafts/edition-119.md @@ -197,4 +197,5 @@ Christian Couder <>, Jakub Narębski <>, Markus Jansen <> and Kaartic Sivaraam <> -with help from Justin Tobler, D. Ben Knoble and Adam Johnson. +with help from Justin Tobler, D. Ben Knoble, +Brandon Pugh and Adam Johnson. From f982d7d1642ea6954795b3bd2d3758bd31c182e0 Mon Sep 17 00:00:00 2001 From: Markus Jansen Date: Fri, 31 Jan 2025 01:07:31 +0100 Subject: [PATCH 083/227] Supplied a single tiny spelling fix. --- rev_news/drafts/edition-119.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-119.md b/rev_news/drafts/edition-119.md index da912fd6c..13d89370f 100644 --- a/rev_news/drafts/edition-119.md +++ b/rev_news/drafts/edition-119.md @@ -44,7 +44,7 @@ This edition covers what happened during the months of December 2024 and January metadata, but pointing to other tools, [etckeeper](https://etckeeper.branchable.com/) and [metastore](https://github.com/przemoc/metastore), that can help - with storing that in a separate file and restoring it on checkout. + with storing them in a separate file and restoring them on checkout. Junio agreed with Peff that Git is extensible that way. From 23c3cb150d34e91f9c57dc879b0cbeb2e5d52cd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20N=C4=9Bmec?= Date: Fri, 31 Jan 2025 17:31:32 +0100 Subject: [PATCH 084/227] rn-119: minor copy edit --- rev_news/drafts/edition-119.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/rev_news/drafts/edition-119.md b/rev_news/drafts/edition-119.md index 13d89370f..a974f6017 100644 --- a/rev_news/drafts/edition-119.md +++ b/rev_news/drafts/edition-119.md @@ -30,7 +30,7 @@ This edition covers what happened during the months of December 2024 and January + [git support for "xattrs" (extended filesystem attributes)?](https://lore.kernel.org/git/5b4c09a9-64bb-e672-e604-120563fc1ad6@das-werkstatt.com/) - Peter B. asked in the Git mailing list if there was a way to store + Peter B. asked on the Git mailing list if there was a way to store [extended attributes (xattrs)](https://en.wikipedia.org/wiki/Extended_file_attributes) in Git. His use case was professional archival collection and he needed bit-proof preservation of all xattrs, even larger ones. @@ -39,7 +39,7 @@ This edition covers what happened during the months of December 2024 and January "contents, pathnames where these contents are stored, and the executable bit". - Peff, alias Jeff King, also replied to Peter confirming that Git, + Jeff King, alias Peff, also replied to Peter confirming that Git, like most other version control systems, doesn't store most metadata, but pointing to other tools, [etckeeper](https://etckeeper.branchable.com/) and @@ -65,9 +65,9 @@ This edition covers what happened during the months of December 2024 and January Peter replied to brian thanking everyone for the suggestions and saying he would especially take a look at `mtree` and - `metastore`. He thanked again brian later saying that `go-mtree` - looked very promising and that he was going to look at - `post-checkout` hooks. + `metastore`. He thanked brian again in the following message, + saying that `go-mtree` looked very promising and that he was going + to look at `post-checkout` hooks. ## Developer Spotlight: Justin Tobler @@ -165,7 +165,7 @@ __Git tools and sites__ + Git [2.48.1 and friends (security releases)](https://public-inbox.org/git/xmqq5xmh46oc.fsf@gitster.g/), [2.48.0](https://public-inbox.org/git/xmqqplku7cvm.fsf@gitster.g/), [2.48.0-rc2](https://public-inbox.org/git/xmqqbjwjyalr.fsf@gitster.g/) -+ Git for Windows [2.47.1(2) (security release)](https://github.com/git-for-windows/git/releases/tag/v2.47.1.windows.2) ++ Git for Windows [2.47.1(2) (security release)](https://github.com/git-for-windows/git/releases/tag/v2.47.1.windows.2), [2.48.0-rc2(1)](https://github.com/git-for-windows/git/releases/tag/v2.48.0-rc2.windows.1) + GitLab [17.8.1, 17.7.3, 17.6.4](https://about.gitlab.com/releases/2025/01/22/patch-release-gitlab-17-8-1-released/), [17.8](https://about.gitlab.com/releases/2025/01/16/gitlab-17-8-released/), From 23a052b550f8f4c57c836a400aad4888f88cbf86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Nar=C4=99bski?= Date: Sat, 1 Feb 2025 00:59:51 +0100 Subject: [PATCH 085/227] rn-119: Add links to articles from issue #743 --- rev_news/drafts/edition-119.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/rev_news/drafts/edition-119.md b/rev_news/drafts/edition-119.md index 13d89370f..a668cebfa 100644 --- a/rev_news/drafts/edition-119.md +++ b/rev_news/drafts/edition-119.md @@ -153,6 +153,29 @@ __Various__ __Light reading__ +* [Commit subject case in Git history](https://benknoble.github.io/blog/2025/01/04/git-subject-case/) + analysis by D. Ben Knoble, as a blog post on his Junk Drawer site. +* [Is there a way to split the git history of a file or combine the histories of two files without a merge commit?](https://devblogs.microsoft.com/oldnewthing/20241218-00/?p=110655), + a short exploration by Raymond Chen on The Old New Thing, part of Microsoft Dev Blogs. + * One of other blog posts referenced in the above mentioned exploration was in Git Rev News: + [Mundane git tricks: Combining two files into one while preserving line history](https://devblogs.microsoft.com/oldnewthing/20190514-00/?p=102493) + was mentioned in [Edition #51](https://git.github.io/rev_news/2019/05/22/edition-51/), while + [How do I split a file into two while preserving git line history?](https://devblogs.microsoft.com/oldnewthing/20190916-00/?p=102892) + was not present, but related + [How to split off an older copy of a file while preserving git line history](https://devblogs.microsoft.com/oldnewthing/20230728-00/?p=108498) + was in [Edition #104](https://git.github.io/rev_news/2023/10/31/edition-104/). +* [Edit commit message with git reword (`git commit --fixup:reword=`)](https://www.brandonpugh.com/til/git/edit-commit-message-with-reword/) + in Brandon Pugh's TILs: Today I learned... (2024) +* [How I use git worktrees](https://notes.billmill.org/blog/2024/03/How_I_use_git_worktrees.html) + (with the help of custom [worktree](https://github.com/llimllib/personal_code/blob/daab9eb1/homedir/.local/bin/worktree#L1) script) + by Bill Mill on their blog (2024). + * See also [How I Use Git Worktrees](https://matklad.github.io/2024/07/25/git-worktrees.html) + by Alex Kladov (matklad) on his GitHub Pages-based blog, + mentioned in [Git Rev News Edition #113](https://git.github.io/rev_news/2024/07/31/edition-113/) +* [Git Trailers](https://alchemists.io/articles/git_trailers) by Brooke Kuhlmann + was mentioned in [Git Rev News Edition #108](https://git.github.io/rev_news/2024/02/29/edition-108/), + but was since then updated. + From e99971e16428e44a19318d078091352d7aa60ea9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Nar=C4=99bski?= Date: Sat, 1 Feb 2025 02:11:29 +0100 Subject: [PATCH 086/227] rn-119: Add links to various news, articles, sites, and tools --- rev_news/drafts/edition-119.md | 63 ++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/rev_news/drafts/edition-119.md b/rev_news/drafts/edition-119.md index a668cebfa..c19273f22 100644 --- a/rev_news/drafts/edition-119.md +++ b/rev_news/drafts/edition-119.md @@ -146,15 +146,65 @@ This edition covers what happened during the months of December 2024 and January __Various__ +* [Highlights from Git 2.48](https://github.blog/open-source/git/highlights-from-git-2-48/) + by Taylor Blau on GitHub Blog, about + faster SHA-1s computations for checksums, adding `--remerge-diff` option to `git range-diff` command, + memory-leak free tests, introducing the Meson build system, and more. +* [What’s new in Git 2.48.0?](https://about.gitlab.com/blog/2025/01/10/whats-new-in-git-2-48-0/) + by Christian Couder on GitLab Blog, about + the Meson build system, Git becoming memory-leak free, improved bundle URI checks, + adding reference consistency checks, more performant 'reftables' implementation, + support for reflogs in `git-refs migrate` (to migrate to 'reftables'), + the 'ref-filter' subsystem optimizations, and more. +* [Git security vulnerabilities announced](https://github.blog/open-source/git/git-security-vulnerabilities-announced-5/) + by Taylor Blau on GitHub Blog: + CVE-2024-50349 (ANSI escape sequences in hostname, and prompt for interactive credentials), + CVE-2024-52006 (specially-crafted repository URL, and credential helpers). + * See also [Clone2Leak: Your Git Credentials Belong To Us](https://flatt.tech/research/posts/clone2leak-your-git-credentials-belong-to-us/) + by RyotaK (@ryotkak), a security engineer at GMO Flatt Security Inc. * Adam Johnson’s book “Boost Your Git DX” [has been updated](https://adamj.eu/tech/2025/01/28/bygdx-second-update/) with 28 new pages of content. This book was first mentioned in [Git Rev News Edition #104](https://git.github.io/rev_news/2023/10/31/edition-104/). + __Light reading__ +* [Off-the-shelf governance models for small FOSS projects?](https://antonin.delpeuch.eu/posts/off-the-shelf-governance-models-for-small-foss-projects/) + by Antonin Delpeuch, about an idea for `GOVERNANCE.md` file template or generator, + as another recommended addition to `README.md`, `LICENSE`, and Code of Conduct. + Mergiraf's [`GOVERNANCE.md`](https://codeberg.org/mergiraf/mergiraf/src/branch/main/GOVERNANCE.md) + is his example - the goal here is to make it clear for project users about + what one can do if there is an issue/bug, or if one wants to add some new feature to a project. +* [Re: DCO](https://inbox.sourceware.org/gdb/Z5esfoH+wMxmDyRP@ebb.org/) + by Bradley M. Kuhn of Software Freedom Conservancy on GDB Development mailing list (via GDB public-inbox instance), + about considering implementing Digital Certificate of Origin for a project (like Linux kernel and Git project do). +* [The many names of commit 55039832f98c](https://lwn.net/Articles/1005222/) + by Jonathan Corbet on LWN\.net, about difficuties finding the commit in mainline kernel repository + that corresponds to the specific commit/patch sent to stable-update mailing list, + in the presence of DRM community's wide use of cherry-picking + (without something like "change ID" that is used by Gerrit). +* [The slow death of TuxFamily](https://lwn.net/Articles/1004988/), a French free-software-hosting service, + by Joe Brockmeier on LWN\.net. +* [A Retrospective on the Source Code Control System](https://www.mrochkind.com/mrochkind/docs/SCCSretro2.pdf) + by Marc J. Rochkind (PDF). +* [Considerations for making a tree view component (in a web Git UI) accessible](https://github.blog/engineering/user-experience/considerations-for-making-a-tree-view-component-accessible/) + by Eric Bailey on GitHub Blog. * [Commit subject case in Git history](https://benknoble.github.io/blog/2025/01/04/git-subject-case/) analysis by D. Ben Knoble, as a blog post on his Junk Drawer site. +* [Colliding with the SHA prefix of Linux's initial Git commit](https://people.kernel.org/kees/colliding-with-the-sha-prefix-of-linuxs-initial-git-commit) + Or, how to break all the tools that parse the “Fixes:” tag, + by Kees Cook on people\.kernel\.org. Note that the 12-character prefix collision + was generated with the help of the [lucky-commit](https://github.com/not-an-aardvark/lucky-commit) project; + this tool was mentioned in [Git Rev News Edition #109](https://git.github.io/rev_news/2024/03/31/edition-109/). + * See also [Facing the Git commit-ID collision catastrophe](https://lwn.net/Articles/1001526/) + by Jonathan Corbet on LWN\.net, mentioned in [the previous edition](https://git.github.io/rev_news/2024/12/31/edition-118/). +* [How to set up your ~~own Git server~~ Gitea instance at home for your personal projects](https://www.xda-developers.com/set-up-your-own-git-server-at-home/) + by Ty Sherback on XDA Developers. + * [Gitea](https://about.gitea.com/), a Go-based software forge (fork of [Gogs](https://gogs.io/)), + was first mentioned in [Git Rev News Edition #23](https://git.github.io/rev_news/2017/01/25/edition-23/). + There is also [Forgejo](https://forgejo.org/), fork of Gitea, + mentioned in [Git Rev News Edition #114](https://git.github.io/rev_news/2024/08/31/edition-114/). * [Is there a way to split the git history of a file or combine the histories of two files without a merge commit?](https://devblogs.microsoft.com/oldnewthing/20241218-00/?p=110655), a short exploration by Raymond Chen on The Old New Thing, part of Microsoft Dev Blogs. * One of other blog posts referenced in the above mentioned exploration was in Git Rev News: @@ -182,6 +232,19 @@ __Easy watching__ __Git tools and sites__ +* [Project Harmony (Harmony Agreements)](https://www.harmonyagreements.org/) + is a community-centered group focused on _contributor agreements_ + for free and open source software (FOSS). +* [todo-md](https://codeberg.org/lig/todo-md) is a pre-commit hook written in Bash + that automatically maintains a `TODO.md` file in your repository. + It collects `TODO:` comments from your code and organizes them into a markdown file, + making it easy to track tasks and improvements. + Under MIT license. +* [Yek](https://github.com/bodo-run/yek) (يک) is a fast Rust based tool + to serialize (selected) text-based files in a repository or directory + into a single file meant for LLM consumption. Mentions similar projects. + Under MIT license. + ## Releases From 85cdf98c14b960f457a75384b628e9992b3a6fc0 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sat, 1 Feb 2025 22:39:30 +0100 Subject: [PATCH 087/227] =?UTF-8?q?rn-119:=20add=20=C5=A0t=C4=9Bp=C3=A1n?= =?UTF-8?q?=20N=C4=9Bmec=20among=20the=20helpers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rev_news/drafts/edition-119.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-119.md b/rev_news/drafts/edition-119.md index 6635e414b..13a39edb4 100644 --- a/rev_news/drafts/edition-119.md +++ b/rev_news/drafts/edition-119.md @@ -284,4 +284,4 @@ Jakub Narębski <>, Markus Jansen <> and Kaartic Sivaraam <> with help from Justin Tobler, D. Ben Knoble, -Brandon Pugh and Adam Johnson. +Brandon Pugh, Štěpán Němec and Adam Johnson. From 938ce96f903dcfde75b7b5101c77e2c618ad7685 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sat, 1 Feb 2025 22:40:56 +0100 Subject: [PATCH 088/227] Publish rn-119 in _posts/ --- .../edition-119.md => _posts/2025-01-31-edition-119.markdown | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename rev_news/drafts/edition-119.md => _posts/2025-01-31-edition-119.markdown (100%) diff --git a/rev_news/drafts/edition-119.md b/_posts/2025-01-31-edition-119.markdown similarity index 100% rename from rev_news/drafts/edition-119.md rename to _posts/2025-01-31-edition-119.markdown From b566c0c4aa29391ea238fb954aec89532c409736 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sat, 1 Feb 2025 22:40:56 +0100 Subject: [PATCH 089/227] Add draft for rn-120 --- rev_news/drafts/edition-120.md | 60 ++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 rev_news/drafts/edition-120.md diff --git a/rev_news/drafts/edition-120.md b/rev_news/drafts/edition-120.md new file mode 100644 index 000000000..027c55710 --- /dev/null +++ b/rev_news/drafts/edition-120.md @@ -0,0 +1,60 @@ +--- +title: Git Rev News Edition 120 (February 28th, 2025) +layout: default +date: 2025-02-28 12:06:51 +0100 +author: chriscool +categories: [news] +navbar: false +--- + +## Git Rev News: Edition 120 (February 28th, 2025) + +Welcome to the 120th edition of [Git Rev News](https://git.github.io/rev_news/rev_news/), +a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to +subscribe, see [the Git Rev News page](https://git.github.io/rev_news/rev_news/) on [git.github.io](http://git.github.io). + +This edition covers what happened during the months of January 2025 and February 2025. + +## Discussions + + + + + + + + + +## Other News + +__Various__ + + +__Light reading__ + + + +__Git tools and sites__ + + +## Releases + + +## Credits + +This edition of Git Rev News was curated by +Christian Couder <>, +Jakub Narębski <>, +Markus Jansen <> and +Kaartic Sivaraam <> +with help from XXX. From 3bd8496dc8eb8dc439ae8d3178e13abf079a0c0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20N=C4=9Bmec?= Date: Mon, 3 Feb 2025 16:19:00 +0100 Subject: [PATCH 090/227] rn-119: minor copy edit, part II --- _posts/2025-01-31-edition-119.markdown | 28 +++++++++++++------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/_posts/2025-01-31-edition-119.markdown b/_posts/2025-01-31-edition-119.markdown index 13a39edb4..8480f0208 100644 --- a/_posts/2025-01-31-edition-119.markdown +++ b/_posts/2025-01-31-edition-119.markdown @@ -148,11 +148,11 @@ __Various__ * [Highlights from Git 2.48](https://github.blog/open-source/git/highlights-from-git-2-48/) by Taylor Blau on GitHub Blog, about - faster SHA-1s computations for checksums, adding `--remerge-diff` option to `git range-diff` command, - memory-leak free tests, introducing the Meson build system, and more. + faster SHA-1 computations for checksums, adding `--remerge-diff` option to `git range-diff` command, + memory-leak-free tests, introducing the Meson build system, and more. * [What’s new in Git 2.48.0?](https://about.gitlab.com/blog/2025/01/10/whats-new-in-git-2-48-0/) by Christian Couder on GitLab Blog, about - the Meson build system, Git becoming memory-leak free, improved bundle URI checks, + the Meson build system, Git becoming memory-leak-free, improved bundle URI checks, adding reference consistency checks, more performant 'reftables' implementation, support for reflogs in `git-refs migrate` (to migrate to 'reftables'), the 'ref-filter' subsystem optimizations, and more. @@ -174,14 +174,14 @@ __Light reading__ by Antonin Delpeuch, about an idea for `GOVERNANCE.md` file template or generator, as another recommended addition to `README.md`, `LICENSE`, and Code of Conduct. Mergiraf's [`GOVERNANCE.md`](https://codeberg.org/mergiraf/mergiraf/src/branch/main/GOVERNANCE.md) - is his example - the goal here is to make it clear for project users about - what one can do if there is an issue/bug, or if one wants to add some new feature to a project. + is his example - the goal here is to make it clear for project users + what one can do if there is an issue/bug, or if one wants to add a new feature to a project. * [Re: DCO](https://inbox.sourceware.org/gdb/Z5esfoH+wMxmDyRP@ebb.org/) by Bradley M. Kuhn of Software Freedom Conservancy on GDB Development mailing list (via GDB public-inbox instance), - about considering implementing Digital Certificate of Origin for a project (like Linux kernel and Git project do). + about the considerations when adopting the Developer Certificate of Origin for a project (similarly to the Linux kernel and Git). * [The many names of commit 55039832f98c](https://lwn.net/Articles/1005222/) - by Jonathan Corbet on LWN\.net, about difficuties finding the commit in mainline kernel repository - that corresponds to the specific commit/patch sent to stable-update mailing list, + by Jonathan Corbet on LWN\.net, about difficulties finding the commit in mainline kernel repository + that corresponds to the specific commit/patch sent to the stable-update mailing list, in the presence of DRM community's wide use of cherry-picking (without something like "change ID" that is used by Gerrit). * [The slow death of TuxFamily](https://lwn.net/Articles/1004988/), a French free-software-hosting service, @@ -203,17 +203,17 @@ __Light reading__ by Ty Sherback on XDA Developers. * [Gitea](https://about.gitea.com/), a Go-based software forge (fork of [Gogs](https://gogs.io/)), was first mentioned in [Git Rev News Edition #23](https://git.github.io/rev_news/2017/01/25/edition-23/). - There is also [Forgejo](https://forgejo.org/), fork of Gitea, + There is also [Forgejo](https://forgejo.org/), a fork of Gitea, mentioned in [Git Rev News Edition #114](https://git.github.io/rev_news/2024/08/31/edition-114/). * [Is there a way to split the git history of a file or combine the histories of two files without a merge commit?](https://devblogs.microsoft.com/oldnewthing/20241218-00/?p=110655), a short exploration by Raymond Chen on The Old New Thing, part of Microsoft Dev Blogs. - * One of other blog posts referenced in the above mentioned exploration was in Git Rev News: + * Some of the other blog posts referenced in the above-mentioned exploration also made their appearance in Git Rev News: [Mundane git tricks: Combining two files into one while preserving line history](https://devblogs.microsoft.com/oldnewthing/20190514-00/?p=102493) - was mentioned in [Edition #51](https://git.github.io/rev_news/2019/05/22/edition-51/), while + was mentioned in [Edition #51](https://git.github.io/rev_news/2019/05/22/edition-51/). [How do I split a file into two while preserving git line history?](https://devblogs.microsoft.com/oldnewthing/20190916-00/?p=102892) - was not present, but related + was not present, but the related [How to split off an older copy of a file while preserving git line history](https://devblogs.microsoft.com/oldnewthing/20230728-00/?p=108498) - was in [Edition #104](https://git.github.io/rev_news/2023/10/31/edition-104/). + appeared in [Edition #104](https://git.github.io/rev_news/2023/10/31/edition-104/). * [Edit commit message with git reword (`git commit --fixup:reword=`)](https://www.brandonpugh.com/til/git/edit-commit-message-with-reword/) in Brandon Pugh's TILs: Today I learned... (2024) * [How I use git worktrees](https://notes.billmill.org/blog/2024/03/How_I_use_git_worktrees.html) @@ -237,7 +237,7 @@ __Git tools and sites__ for free and open source software (FOSS). * [todo-md](https://codeberg.org/lig/todo-md) is a pre-commit hook written in Bash that automatically maintains a `TODO.md` file in your repository. - It collects `TODO:` comments from your code and organizes them into a markdown file, + It collects `TODO:` comments from your code and organizes them into a Markdown file, making it easy to track tasks and improvements. Under MIT license. * [Yek](https://github.com/bodo-run/yek) (يک) is a fast Rust based tool From 809bad6878557084159ee0002cb76d645881756a Mon Sep 17 00:00:00 2001 From: Kaartic Sivaraam Date: Wed, 5 Feb 2025 00:10:15 +0530 Subject: [PATCH 091/227] SoC-2025: update possible mentors for projects --- SoC-2025-Ideas.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/SoC-2025-Ideas.md b/SoC-2025-Ideas.md index ae3b86cb7..194980e5a 100644 --- a/SoC-2025-Ideas.md +++ b/SoC-2025-Ideas.md @@ -84,6 +84,8 @@ _Languages_: C, shell(bash) _Possible mentors_: * Patrick Steinhardt < > +* Karthik Nayak < > +* Jialuo She < > ### Machine-Readable Repository Information Query Tool @@ -115,6 +117,7 @@ _Languages_: C, shell(bash) _Possible mentors_: * Patrick Steinhardt < > +* Karthik Nayak < > ### Implement support for reftables in "dumb" HTTP transport From baafed34d59abb1bc77afabf5839fb7409721ae9 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 5 Feb 2025 14:11:48 +0100 Subject: [PATCH 092/227] SoC-2025: add Christian Couder as possible mentor --- SoC-2025-Ideas.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SoC-2025-Ideas.md b/SoC-2025-Ideas.md index 194980e5a..d742e1e74 100644 --- a/SoC-2025-Ideas.md +++ b/SoC-2025-Ideas.md @@ -57,6 +57,7 @@ _Possible mentors_: * Patrick Steinhardt < > * Jialuo She < > +* Christian Couder < > ### Refactoring in order to reduce Git's global state @@ -86,6 +87,7 @@ _Possible mentors_: * Patrick Steinhardt < > * Karthik Nayak < > * Jialuo She < > +* Christian Couder < > ### Machine-Readable Repository Information Query Tool From a3f6ad051682ba73b32c1baf900d06b590a5f519 Mon Sep 17 00:00:00 2001 From: Kaartic Sivaraam Date: Thu, 6 Feb 2025 00:14:24 +0530 Subject: [PATCH 093/227] SoC-2025-microproject: some indentation tweaks of code snippets They were not rendered properly in the website. So, try fixing indentation to check if it helps correct the rendering. --- SoC-2025-Microprojects.md | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/SoC-2025-Microprojects.md b/SoC-2025-Microprojects.md index a8b820c17..82d725166 100644 --- a/SoC-2025-Microprojects.md +++ b/SoC-2025-Microprojects.md @@ -53,30 +53,30 @@ with Git's dedicated test helpers like `test_path_is_file`. #### Steps to Complete 1. Find a test script using old-style path checks: -```sh -git grep "test -[efd]" t/ -``` + ```sh + git grep "test -[efd]" t/ + ``` 2. Look for patterns like: -```sh -test -f path/to/file # old way -test_path_is_file path/to/file # new way + ```sh + test -f path/to/file # old way + test_path_is_file path/to/file # new way -test -d some/directory # old way -test_path_is_dir some/directory # new way -``` + test -d some/directory # old way + test_path_is_dir some/directory # new way + ``` 3. Important: Only replace checks that are actually testing for conditions, not those used in flow control. For example: -```sh -# DON'T change this - it's flow control -if test -e "file.txt"; then - do_something -fi - -# DO change this - it's a test assertion -test -e "file.txt" || error "file.txt should exist" -``` + ```sh + # DON'T change this - it's flow control + if test -e "file.txt"; then + do_something + fi + + # DO change this - it's a test assertion + test -e "file.txt" || error "file.txt should exist" + ``` #### Notes - Start small: Pick a test file with just a few instances to convert From 99e8a93b7b8756026da74a0c81bb9aec5477d0ab Mon Sep 17 00:00:00 2001 From: Markus Jansen Date: Thu, 6 Feb 2025 00:49:50 +0100 Subject: [PATCH 094/227] Some very minor late fixes. --- _posts/2025-01-31-edition-119.markdown | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/_posts/2025-01-31-edition-119.markdown b/_posts/2025-01-31-edition-119.markdown index 8480f0208..3e38e4eaa 100644 --- a/_posts/2025-01-31-edition-119.markdown +++ b/_posts/2025-01-31-edition-119.markdown @@ -148,7 +148,7 @@ __Various__ * [Highlights from Git 2.48](https://github.blog/open-source/git/highlights-from-git-2-48/) by Taylor Blau on GitHub Blog, about - faster SHA-1 computations for checksums, adding `--remerge-diff` option to `git range-diff` command, + faster SHA-1 computations for checksums, adding option `--remerge-diff` to the `git range-diff` command, memory-leak-free tests, introducing the Meson build system, and more. * [What’s new in Git 2.48.0?](https://about.gitlab.com/blog/2025/01/10/whats-new-in-git-2-48-0/) by Christian Couder on GitLab Blog, about @@ -158,8 +158,8 @@ __Various__ the 'ref-filter' subsystem optimizations, and more. * [Git security vulnerabilities announced](https://github.blog/open-source/git/git-security-vulnerabilities-announced-5/) by Taylor Blau on GitHub Blog: - CVE-2024-50349 (ANSI escape sequences in hostname, and prompt for interactive credentials), - CVE-2024-52006 (specially-crafted repository URL, and credential helpers). + [CVE-2024-50349](https://nvd.nist.gov/vuln/detail/CVE-2024-50349) (ANSI escape sequences in hostname and prompt for interactive credentials) and + [CVE-2024-52006](https://nvd.nist.gov/vuln/detail/CVE-2024-52006) (specially-crafted repository URL and credential helpers). * See also [Clone2Leak: Your Git Credentials Belong To Us](https://flatt.tech/research/posts/clone2leak-your-git-credentials-belong-to-us/) by RyotaK (@ryotkak), a security engineer at GMO Flatt Security Inc. * Adam Johnson’s book “Boost Your Git DX” @@ -215,13 +215,13 @@ __Light reading__ [How to split off an older copy of a file while preserving git line history](https://devblogs.microsoft.com/oldnewthing/20230728-00/?p=108498) appeared in [Edition #104](https://git.github.io/rev_news/2023/10/31/edition-104/). * [Edit commit message with git reword (`git commit --fixup:reword=`)](https://www.brandonpugh.com/til/git/edit-commit-message-with-reword/) - in Brandon Pugh's TILs: Today I learned... (2024) + in Brandon Pugh's TILs: Today I learned... (2024). * [How I use git worktrees](https://notes.billmill.org/blog/2024/03/How_I_use_git_worktrees.html) (with the help of custom [worktree](https://github.com/llimllib/personal_code/blob/daab9eb1/homedir/.local/bin/worktree#L1) script) by Bill Mill on their blog (2024). * See also [How I Use Git Worktrees](https://matklad.github.io/2024/07/25/git-worktrees.html) by Alex Kladov (matklad) on his GitHub Pages-based blog, - mentioned in [Git Rev News Edition #113](https://git.github.io/rev_news/2024/07/31/edition-113/) + mentioned in [Git Rev News Edition #113](https://git.github.io/rev_news/2024/07/31/edition-113/). * [Git Trailers](https://alchemists.io/articles/git_trailers) by Brooke Kuhlmann was mentioned in [Git Rev News Edition #108](https://git.github.io/rev_news/2024/02/29/edition-108/), but was since then updated. From 6864bb72e3df92324677e038ba74802ad8fd3cd3 Mon Sep 17 00:00:00 2001 From: Kaartic Sivaraam Date: Fri, 7 Feb 2025 13:03:32 +0530 Subject: [PATCH 095/227] SoC-2025: mention 3 as the maximum students we could pick --- SoC-2025-Ideas.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SoC-2025-Ideas.md b/SoC-2025-Ideas.md index d742e1e74..567092944 100644 --- a/SoC-2025-Ideas.md +++ b/SoC-2025-Ideas.md @@ -22,7 +22,7 @@ page though. ### Note about limit of project selection Kindly note that considering the bandwidth of available mentors, the -Git project would only mentor up to 2 contributors this year. +Git project would only mentor up to 3 contributors this year. This is not a hard and fast rule. It may change if more community members are willing to mentor in the coming days. For instance, this may happen when From 4cc9e44e9fdc6beff19ce290bd3dbde162355174 Mon Sep 17 00:00:00 2001 From: Kaartic Sivaraam Date: Tue, 11 Feb 2025 10:44:19 +0530 Subject: [PATCH 096/227] SoC-2025: convey that we prefer ref consolidation work --- SoC-2025-Ideas.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/SoC-2025-Ideas.md b/SoC-2025-Ideas.md index d742e1e74..d99515e47 100644 --- a/SoC-2025-Ideas.md +++ b/SoC-2025-Ideas.md @@ -153,6 +153,11 @@ See: - +**Note**: While both ideas are valuable, we prioritize the 'Consolidate ref-related +functionality into git-refs' proposal. If we receive applications for both +projects, preference will be given to applications focusing on the git-refs +consolidation work. + _Expected Project Size_: 175 hours or 350 hours _Difficulty_: Medium From e756f3915d8984cb51356b6353b82748fcf27cd1 Mon Sep 17 00:00:00 2001 From: Kaartic Sivaraam Date: Tue, 11 Feb 2025 23:19:08 +0530 Subject: [PATCH 097/227] SoC-2025-Ideas: minor sentence tweak as suggested by Patrick Co-authored-by: Patrick Steinhardt --- SoC-2025-Ideas.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SoC-2025-Ideas.md b/SoC-2025-Ideas.md index d99515e47..0ba5f56de 100644 --- a/SoC-2025-Ideas.md +++ b/SoC-2025-Ideas.md @@ -154,7 +154,7 @@ See: - **Note**: While both ideas are valuable, we prioritize the 'Consolidate ref-related -functionality into git-refs' proposal. If we receive applications for both +functionality into git-refs' proposal over support for reftables in "dumb" HTTP transport. If we receive applications for both projects, preference will be given to applications focusing on the git-refs consolidation work. From b679cea8be7ca64d1d3408a508de20be71a4d573 Mon Sep 17 00:00:00 2001 From: Kaartic Sivaraam Date: Sun, 16 Feb 2025 19:19:39 +0530 Subject: [PATCH 098/227] SoC-2025: mention Ghanshyam as a possible mentor --- SoC-2025-Ideas.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SoC-2025-Ideas.md b/SoC-2025-Ideas.md index 5fd85e53f..de4064eef 100644 --- a/SoC-2025-Ideas.md +++ b/SoC-2025-Ideas.md @@ -120,7 +120,7 @@ _Possible mentors_: * Patrick Steinhardt < > * Karthik Nayak < > - +* Ghanshyam Thakkar < > ### Implement support for reftables in "dumb" HTTP transport From 869eef61a45415538dbd9e5cb7875d9f3692a0d5 Mon Sep 17 00:00:00 2001 From: Kaartic Sivaraam Date: Sun, 23 Feb 2025 23:01:24 +0530 Subject: [PATCH 099/227] SoC-2025: include Ghanshyam as potential mentor in other projects As per https://public-inbox.org/git/D7UTMXEUFQS8.15HJN6CTDM16S@gmail.com/ --- SoC-2025-Ideas.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/SoC-2025-Ideas.md b/SoC-2025-Ideas.md index de4064eef..fac121ab4 100644 --- a/SoC-2025-Ideas.md +++ b/SoC-2025-Ideas.md @@ -58,6 +58,7 @@ _Possible mentors_: * Patrick Steinhardt < > * Jialuo She < > * Christian Couder < > +* Ghanshyam Thakkar < > ### Refactoring in order to reduce Git's global state @@ -88,6 +89,7 @@ _Possible mentors_: * Karthik Nayak < > * Jialuo She < > * Christian Couder < > +* Ghanshyam Thakkar < > ### Machine-Readable Repository Information Query Tool @@ -122,6 +124,7 @@ _Possible mentors_: * Karthik Nayak < > * Ghanshyam Thakkar < > + ### Implement support for reftables in "dumb" HTTP transport Fetching Git repositories uses one of two major protocols: From ff5486ecf6b929b1fb4a4326a525842aa61ba104 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Thu, 27 Feb 2025 12:03:46 +0100 Subject: [PATCH 100/227] rn-120: add releases --- rev_news/drafts/edition-120.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/rev_news/drafts/edition-120.md b/rev_news/drafts/edition-120.md index 027c55710..2a39c79d7 100644 --- a/rev_news/drafts/edition-120.md +++ b/rev_news/drafts/edition-120.md @@ -49,6 +49,28 @@ __Git tools and sites__ ## Releases ++ Git [2.49.0-rc0](https://public-inbox.org/git/xmqqzfi8bljk.fsf@gitster.g/) ++ Git for Windows [2.49.0-rc0(1)](https://github.com/git-for-windows/git/releases/tag/v2.49.0-rc0.windows.1), +[2.48.1(1)](https://github.com/git-for-windows/git/releases/tag/v2.48.1.windows.1) ++ GitHub Enterprise [3.16.0](https://help.github.com/enterprise-server@3.16/admin/release-notes#3.16.0), +[3.15.3](https://help.github.com/enterprise-server@3.15/admin/release-notes#3.15.3), +[3.14.8](https://help.github.com/enterprise-server@3.14/admin/release-notes#3.14.8), +[3.13.11](https://help.github.com/enterprise-server@3.13/admin/release-notes#3.13.11), +[3.12.15](https://help.github.com/enterprise-server@3.12/admin/release-notes#3.12.15) ++ GitLab [17.9.1, 17.8.4, 17.7.6](https://about.gitlab.com/releases/2025/02/26/patch-release-gitlab-17-9-1-released/), +[17.9](https://about.gitlab.com/releases/2025/02/20/gitlab-17-9-released/), +[17.8.2, 17.7.4, 17.6.5](https://about.gitlab.com/releases/2025/02/12/patch-release-gitlab-17-8-2-released/) ++ GitKraken [10.7.0](https://help.gitkraken.com/gitkraken-client/current/), +[10.6.3](https://help.gitkraken.com/gitkraken-client/current/) ++ GitHub Desktop [3.4.17](https://desktop.github.com/release-notes/), +[3.4.16](https://desktop.github.com/release-notes/) ++ Sourcetree [4.2.11](https://product-downloads.atlassian.com/software/sourcetree/ReleaseNotes/Sourcetree_4.2.11.html) ++ tig [2.5.12](https://github.com/jonas/tig/releases/tag/tig-2.5.12), +[2.5.11](https://github.com/jonas/tig/releases/tag/tig-2.5.11) ++ Garden [2.1.0](https://github.com/garden-rs/garden/releases/tag/v2.1.0) ++ Git Cola [4.12.0](https://github.com/git-cola/git-cola/releases/tag/v4.12.0) ++ GitButler [0.14.8](https://github.com/gitbutlerapp/gitbutler/releases/tag/release/0.14.8), +[0.14.7](https://github.com/gitbutlerapp/gitbutler/releases/tag/release/0.14.7) ## Credits From 8275178588167fd844aa85306daae8250d13cbe6 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Thu, 27 Feb 2025 12:04:23 +0100 Subject: [PATCH 101/227] rn-120: remove redundant year --- rev_news/drafts/edition-120.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-120.md b/rev_news/drafts/edition-120.md index 2a39c79d7..94360920f 100644 --- a/rev_news/drafts/edition-120.md +++ b/rev_news/drafts/edition-120.md @@ -13,7 +13,7 @@ Welcome to the 120th edition of [Git Rev News](https://git.github.io/rev_news/re a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to subscribe, see [the Git Rev News page](https://git.github.io/rev_news/rev_news/) on [git.github.io](http://git.github.io). -This edition covers what happened during the months of January 2025 and February 2025. +This edition covers what happened during the months of January and February 2025. ## Discussions From 99cf196f040c33f50478ab0101cfb2d6448766af Mon Sep 17 00:00:00 2001 From: Bruno Brito Date: Thu, 27 Feb 2025 17:20:55 +0000 Subject: [PATCH 102/227] rn-120: Add Tower 12.5 for Mac release --- rev_news/drafts/edition-120.md | 1 + 1 file changed, 1 insertion(+) diff --git a/rev_news/drafts/edition-120.md b/rev_news/drafts/edition-120.md index 94360920f..59d4d1efa 100644 --- a/rev_news/drafts/edition-120.md +++ b/rev_news/drafts/edition-120.md @@ -71,6 +71,7 @@ __Git tools and sites__ + Git Cola [4.12.0](https://github.com/git-cola/git-cola/releases/tag/v4.12.0) + GitButler [0.14.8](https://github.com/gitbutlerapp/gitbutler/releases/tag/release/0.14.8), [0.14.7](https://github.com/gitbutlerapp/gitbutler/releases/tag/release/0.14.7) ++ Tower for Mac [12.5, 12.5.1, 12.5.2](https://www.git-tower.com/release-notes/mac?show_tab=release-notes) — [Release blog post](https://www.git-tower.com/blog/tower-mac-125/) ## Credits From 844156e55cd6b1f948e2d814456deebeb050ad31 Mon Sep 17 00:00:00 2001 From: Kaartic Sivaraam Date: Thu, 27 Feb 2025 23:58:05 +0530 Subject: [PATCH 103/227] rn-120: include interview with Chris Torek --- rev_news/drafts/edition-120.md | 119 ++++++++++++++++++++++++++++++++- 1 file changed, 116 insertions(+), 3 deletions(-) diff --git a/rev_news/drafts/edition-120.md b/rev_news/drafts/edition-120.md index 94360920f..c3ccbcde3 100644 --- a/rev_news/drafts/edition-120.md +++ b/rev_news/drafts/edition-120.md @@ -29,9 +29,122 @@ This edition covers what happened during the months of January and February 2025 ### Support --> - + +## Community Spotlight: Chris Torek + +_[Chris Torek](https://stackoverflow.com/users/1256452/torek) has been a prolific +contributor to the Git topic on Stack Overflow. This edition features an interview +with him. This a continuation of our initiative to interview community contributors +ouitside of our mailing list. Our first interview was [with VonC in edition 106](https://git.github.io/rev_news/2023/12/31/edition-106/#community-spotlight-vonc)_. + + +* **Who are you and what do you do?** + + "Who am I" is way too complicated! 🙂 What I do ... well, I'm now + retired, and you'd think that would give me more time to answer things + like this. + + I used to do a lot of embedded systems programming, and a lot of + internal company education at times (about programming languages, + various hardware functions and limitations, software tools, and such). + That's what led me to [answering StackOverflow questions](https://stackoverflow.com/users/1256452/torek?tab=summary). + +* **What would you name your most important contribution to Git?** + + I haven't put much into Git itself. I fixed a minor issue with + case-insensitive rename once, and something that was annoying me about + `git diff` applied to merge commits [[ref](https://public-inbox.org/git/pull.804.v4.git.git.1591978801.gitgitgadget@gmail.com/)]. + +* **What was your motivation behind answering questions about Git on + Stack Overflow?** + + Here, well, I got roped into explaining Git to a group that was moving + from Mercurial. I found existing descriptions to be lacking. + Eventually that particular job went away but the question-answering + persisted, until I got sufficiently annoyed at StackOverflow itself + (for various reasons) to take a break that continues to this day. + +* **If you could get a team of expert developers to work full time on + something in Git for a full year, what would it be?** + + I'm not entirely sure. There are a few big issues today, such as + dealing with OS irregularities (the fact that Windows can't name a + file `aux.h` for instance is a trivial example of the overall problem; + very long file names, case and UTF-8 encoding sensitivities are + another example of the same underlying issue); the ongoing + [transition from SHA-1 to SHA-256](https://git-scm.com/docs/hash-function-transition) + (which works now but there's no cross-compatibility); a number + of minor but sometimes important niggles with merging; support + for extremely large code bases, including submodules and other + ideas (Microsoft's Git VFS). I have no ideas for *how* to + achieve this but a better way to "see" history would, + I think, be a huge improvement. + + One other thing that might be particularly good is an equivalent of + [Mercurial's `evolve` extension](https://www.mercurial-scm.org/doc/evolution/). + But even Mercurial's was never mainstreamed; this is very hard to + get right (whatever "right" means). + +* **If you could remove something from Git without worrying about backwards + compatibility, what would it be?** + + I'm not convinced anything needs to be _removed_, but it would + simplify things a lot if we didn't need SHA-1 compatibility, if + SHA-256 magically just worked and everything were converted over. (And + looking at [VonC's reply](https://git.github.io/rev_news/2023/12/31/edition-106/#community-spotlight-vonc) + I agree that `switch`+`restore` is a much better + split than the old `checkout`.) And, although people like it for + convenience, it might be OK if we all had to use separate + `fetch`-then-(whatever is needed) steps: see below. + +* **What is your favorite Git-related tool/library, outside of Git itself?** + + I don't think I have one. I've used [gitk](https://git-scm.com/docs/gitk) + for history browsing, and if it were somehow improved (see the list of + items above) it might be particularly useful. + +* **What is one of your most favourite features of Git?** + + Speed. Having used the previous generations of version control (and + waited, and waited...), there's nothing quite like doing an update and + having it take only seconds. The distributed nature is also pretty + crucial, though it has its pluses and minuses. + +* **Could you brief a bit about one of your most memorable experience with Git?** + + Hah, the most memorable one was probably one of the worst, back in the + days of Git 1.5 or so. Back then, an initial `git pull` wasn't always + careful about a pre-populated working tree. I had it destroy a week's + worth of code once. Ever since then I've separated pull into fetch + followed by merge-or-rebase. This is long since fixed, but it's + instructive to new users to know that `pull` is really two separate + steps. When I started, I didn't know that: the tutorial I read just + said to run `git pull`. + +* **What is your advice for people who want to start using Git? Where + and how should they start?** + + I'm not entirely fond of any of the introductions I've seen. I started + on a book once (between jobs) but stalled out when I went to work for + another startup. One of these days I plan to get back to it. + +* **There's a common conception that "Git is confusing". What are your + thoughts about the same?** + + There *are* confusing parts, but they are inherent to the issues that + occur with distributed repositories and independent development. The + only way to really understand this is to get a good grounding—hence + the idea of writing a book. + +* **If there’s one tip you would like to share with other Git + developers, what would it be?** + + For *developers* in particular, they should probably have a look at + what surprises Git users. If something didn't work the way someone + expected it to, why? Was it an incorrect expectation (it probably was) + and if so, why did the user *have* that expectation in the first + place? + ## Other News From 3ade44c98461ed71bdd5e36d2b8eb492aae8dc2a Mon Sep 17 00:00:00 2001 From: Kaartic Sivaraam Date: Fri, 28 Feb 2025 08:39:33 +0530 Subject: [PATCH 104/227] SoC-120: mention Git's selection in GSoC --- rev_news/drafts/edition-120.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rev_news/drafts/edition-120.md b/rev_news/drafts/edition-120.md index c3ccbcde3..13356b96f 100644 --- a/rev_news/drafts/edition-120.md +++ b/rev_news/drafts/edition-120.md @@ -150,6 +150,11 @@ ouitside of our mailing list. Our first interview was [with VonC in edition 106] __Various__ +- The Git project has been accepted as a [Mentor Organization](https://summerofcode.withgoogle.com/programs/2025/organizations/git) + for Google Summer of Code (GSoC) 2025. We can still add project ideas to our + [idea page](https://git.github.io/SoC-2025-Ideas/), and volunteers to (co-)mentor + are still welcome. Feel free to join the discussion in the [corresponding thread](http://public-inbox.org/git/6C29409D-691B-471F-B08C-83E14D35EE13@gmail.com/T/#mb087c1b0ed06fcbd56d4ffa320efbeb42fd4983f). + Also, feel free to spread the word about Git’s participation. __Light reading__ From 2dfd1adcd2742fdf99bec7765065a8132f43526f Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 28 Feb 2025 06:56:27 +0100 Subject: [PATCH 105/227] rn-120: add worktree article --- rev_news/drafts/edition-120.md | 110 ++++++++++++++++++++++++++++++++- 1 file changed, 108 insertions(+), 2 deletions(-) diff --git a/rev_news/drafts/edition-120.md b/rev_news/drafts/edition-120.md index c3ccbcde3..7723f2948 100644 --- a/rev_news/drafts/edition-120.md +++ b/rev_news/drafts/edition-120.md @@ -21,9 +21,115 @@ This edition covers what happened during the months of January and February 2025 ### General --> - + ++ [[PATCH] worktree: detect from secondary worktree if main worktree is bare](https://lore.kernel.org/git/pull.1829.git.1731653548549.gitgitgadget@gmail.com/) + + Last November, Olga Pilipenco sent a patch to the mailing list + addressing an issue she encountered while working with multiple + [worktrees](https://git-scm.com/docs/git-worktree). + + Git worktrees allow developers to check out multiple branches from + the same repository simultaneously, each in its own working + directory. Unlike creating separate clones, worktrees share the same + object database and references, saving disk space and avoiding the + need to push and fetch between copies of the repository. They can be + very useful when working on multiple features in parallel or when + needing to make a quick fix while in the middle of other development + work. + + The issue happened when a repository had a main worktree that was + bare with `core.bare = true` in `config.worktree`. If a new + secondary worktree was created, then from that secondary worktree + the main worktree appeared as non-bare. This prevented users from + checking out or working with the default branch of the main worktree + (typically "main" or "master") in the secondary worktree. + + When `extensions.worktreeConfig` is enabled, each worktree has its + own configuration settings in a `config.worktree` file that can + override repository-wide settings in the common `config` file. This + allows different worktrees to have different configurations, but it + also means that settings from one worktree aren't automatically + visible to commands running in another worktree. + + Olga found that when inside the secondary worktree, the main + worktree's configuration wasn't initialized, and her patch fixed + that by loading the main worktree's `config.worktree` file only when + required. + + Unfortunately Olga's email fell through the cracks, receiving no + response. But last January she sent a + [version 2](https://lore.kernel.org/git/pull.1829.v2.git.1737063335673.gitgitgadget@gmail.com/) + of her patch. There was no code change compared to the first + version, but she added people in "Cc:", and she had rebased the + patch on top of the "maint" branch. + + This time Eric Sunshine replied. He acknowledged that this was a + real problem and noted that it had been documented in a "NEEDSWORK" + comment added in 2019 into the code that mentioned it. He then + attempted to rewrite the commit message of the patch in a way that + was "more idiomatic" to the project and that added more details to + help understand the problem. + + The suggested commit message especially mentioned that when + `extensions.worktreeConfig` is true, commands run in a secondary + worktree only consulted `$commondir/config` and + `$commondir/worktrees//config.worktree`. Thus they never saw + that the main worktree's `core.bare` setting was true in + `$commondir/config.worktree`. + + Eric also suggested removing some parts of Olga's commit message + that talked about other solutions she had considered, or that + repeated in which circumstances the problem appeared. Then there + were a number of small comments on the code part of the patch. + + Olga replied to Eric saying that the commit message he proposed was + "so much better" than the original one. She agreed with most of + Eric's suggestions and answered the few questions he asked. + + Eric replied explaining some technical details and making a few more + suggestions. + + Junio Hamano, the Git maintainer then replied to Eric thanking him + "for an easy-to-read review" and thanking Olga for working on this + issue. + + Eric and Olga further discussed technical improvements to the + patch. In the course of that discussion, Eric explained the + historical context related to using the "bare main worktree" + expression: + + > It's a historic "accident" that when worktree support was designed, + > the idea of linking worktrees to a bare repository was not considered. + > Support for using worktrees with a bare repository was added later. + > However, by that time, the term "main worktree" was already well + > established, with the very unfortunate result that even when there is + > no actual "main worktree" but only a bare repository with "linked + > worktrees" hanging off it, the repository itself is usually referred + > to as the "bare main worktree", which is an obvious misnomer; the + > repository is just a repository (i.e. the object database and other + > meta-information) and there is no actual main worktree. + + Olga then sent a + [version 3](https://lore.kernel.org/git/pull.1829.v3.git.1738346881907.gitgitgadget@gmail.com/) + of her patch. It used the commit message suggested by Eric, and + implemented his suggestions. + + Junio reviewed this new version of the patch and had a single + question about the code that decided when it was necessary to read + the main worktree's `config.worktree` file. Olga and Junio further + discussed how to make it clearer what that code was doing, and + eventually agreed on adding a four line long comment on top of it. + + Olga then sent a + [version 4](https://lore.kernel.org/git/pull.1829.v4.git.1738737014194.gitgitgadget@gmail.com/) + of her patch which only added that four line long comment. + + The patch was later merged into the 'master' branch, so the next + 2.49 version of Git that should be released in a few weeks will + finally resolve a long-standing issue and significantly enhance the + usability of Git worktrees for developers working with bare + repositories. __Git tools and sites__ ++ [JJ (Jujutsu) Cheat Sheet](https://justinpombrio.net/2025/02/11/jj-cheat-sheet.html) + by Justin Pombrio. + + [Jujutsu (`jj`)](https://jj-vcs.github.io/jj/), a Git-compatible version control system, + written in Rust, was first mentioned in [Git Rev News Edition #85](https://git.github.io/rev_news/2022/03/31/edition-85/). ++ [Beej's Guide to Git](https://beej.us/guide/bggit/). ++ [Gookme](https://lmaxence.github.io/gookme/) is simple and easy-to-use, + yet powerful and language agnostic git hook manager for [monorepos](https://monorepo.tools/). + Successor of Mookme. Written in Go, under MIT license. + ## Releases From f160b0a00644f151f38ffc45e5021255f6f51298 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Nar=C4=99bski?= Date: Sun, 2 Mar 2025 04:28:48 +0100 Subject: [PATCH 109/227] rn-120: Add 2 links from @bpugh --- rev_news/drafts/edition-120.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rev_news/drafts/edition-120.md b/rev_news/drafts/edition-120.md index af513436f..28db0fc1a 100644 --- a/rev_news/drafts/edition-120.md +++ b/rev_news/drafts/edition-120.md @@ -274,6 +274,8 @@ __Light reading__ by Scott Chacon on GitButler Blog. + See also [Popular git config options](https://jvns.ca/blog/2024/02/16/popular-git-config-options/) by Julia Evans on her blog, which was mentioned in [Git Rev News Edition #108](https://git.github.io/rev_news/2024/02/29/edition-108/). ++ [How to do patch-based review with git range-diff](https://blog.gitbutler.com/interdiff-review-with-git-range-diff/) + by Scott Chacon on GitButler Blog. + [Markdown's Big Brother: Say Hello to AsciiDoc](https://www.git-tower.com/blog/asciidoc-quick-guide) by Marvin Blome on Git-Tower Blog. + Another similar file format for textual data and technical documentation @@ -288,6 +290,8 @@ __Light reading__ with `includeIf`, a short post by Matteo Pampana on Medium\.com. + [Why Some Source Code Files Shouldn’t Be Managed via Git-Based Version Control](https://www.itsecurityguru.org/2025/01/27/why-some-source-code-files-shouldnt-be-managed-via-git-based-version-control/) on IT Security Guru. ++ [Git Stash Without the Branch Name](https://www.brandonpugh.com/blog/git-stash-without-the-branch-name/) + post by Brandon Pugh. + [Microsoft Engineers Highlight Git Repository Bloat Flaw](https://devops.com/microsoft-engineers-highlight-git-repository-bloat-flaw/) by Adrian Bridgwater on DevOps\.com blog (2024). From 9159464ad71710ca7da08db83d8d1751fe0e011f Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sun, 2 Mar 2025 12:56:27 +0100 Subject: [PATCH 110/227] rn-120: add Chris Torek among the helpers --- rev_news/drafts/edition-120.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-120.md b/rev_news/drafts/edition-120.md index 28db0fc1a..5bb869de5 100644 --- a/rev_news/drafts/edition-120.md +++ b/rev_news/drafts/edition-120.md @@ -345,4 +345,4 @@ Christian Couder <>, Jakub Narębski <>, Markus Jansen <> and Kaartic Sivaraam <> -with help from XXX. +with help from Chris Torek. From f0801caedb82a5bebfa317468342bdf83bf84e76 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sun, 2 Mar 2025 12:58:24 +0100 Subject: [PATCH 111/227] rn-120: add Brandon Pugh among the helpers --- rev_news/drafts/edition-120.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-120.md b/rev_news/drafts/edition-120.md index 5bb869de5..85522b7ea 100644 --- a/rev_news/drafts/edition-120.md +++ b/rev_news/drafts/edition-120.md @@ -345,4 +345,4 @@ Christian Couder <>, Jakub Narębski <>, Markus Jansen <> and Kaartic Sivaraam <> -with help from Chris Torek. +with help from Chris Torek and Brandon Pugh. From e17790f8e625a70d747790b9729dab7492f358b4 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sun, 2 Mar 2025 12:59:05 +0100 Subject: [PATCH 112/227] =?UTF-8?q?rn-120:=20add=20=C5=A0t=C4=9Bp=C3=A1n?= =?UTF-8?q?=20N=C4=9Bmec=20among=20the=20helpers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rev_news/drafts/edition-120.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-120.md b/rev_news/drafts/edition-120.md index 85522b7ea..2b799f4a2 100644 --- a/rev_news/drafts/edition-120.md +++ b/rev_news/drafts/edition-120.md @@ -345,4 +345,4 @@ Christian Couder <>, Jakub Narębski <>, Markus Jansen <> and Kaartic Sivaraam <> -with help from Chris Torek and Brandon Pugh. +with help from Chris Torek, Štěpán Němec and Brandon Pugh. From c92de65793c4930b8e4a338d6c9f22ab33a00fd0 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sun, 2 Mar 2025 13:00:23 +0100 Subject: [PATCH 113/227] rn-120: add Bruno Brito among the helpers --- rev_news/drafts/edition-120.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-120.md b/rev_news/drafts/edition-120.md index 2b799f4a2..81721d679 100644 --- a/rev_news/drafts/edition-120.md +++ b/rev_news/drafts/edition-120.md @@ -345,4 +345,5 @@ Christian Couder <>, Jakub Narębski <>, Markus Jansen <> and Kaartic Sivaraam <> -with help from Chris Torek, Štěpán Němec and Brandon Pugh. +with help from Chris Torek, Štěpán Němec, Bruno Brito +and Brandon Pugh. From 7a768e5c96813c11786b07a2d588ca4fb9424079 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sun, 2 Mar 2025 13:02:17 +0100 Subject: [PATCH 114/227] Publish rn-120 in _posts/ --- .../edition-120.md => _posts/2025-02-28-edition-120.markdown | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename rev_news/drafts/edition-120.md => _posts/2025-02-28-edition-120.markdown (100%) diff --git a/rev_news/drafts/edition-120.md b/_posts/2025-02-28-edition-120.markdown similarity index 100% rename from rev_news/drafts/edition-120.md rename to _posts/2025-02-28-edition-120.markdown From 06dade27cfffae49a47298c2406f40ae966c673d Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sun, 2 Mar 2025 13:02:17 +0100 Subject: [PATCH 115/227] Add draft for rn-121 --- rev_news/drafts/edition-121.md | 60 ++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 rev_news/drafts/edition-121.md diff --git a/rev_news/drafts/edition-121.md b/rev_news/drafts/edition-121.md new file mode 100644 index 000000000..2cc724afc --- /dev/null +++ b/rev_news/drafts/edition-121.md @@ -0,0 +1,60 @@ +--- +title: Git Rev News Edition 121 (March 31st, 2025) +layout: default +date: 2025-03-31 12:06:51 +0100 +author: chriscool +categories: [news] +navbar: false +--- + +## Git Rev News: Edition 121 (March 31st, 2025) + +Welcome to the 121st edition of [Git Rev News](https://git.github.io/rev_news/rev_news/), +a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to +subscribe, see [the Git Rev News page](https://git.github.io/rev_news/rev_news/) on [git.github.io](http://git.github.io). + +This edition covers what happened during the months of February 2025 and March 2025. + +## Discussions + + + + + + + + + +## Other News + +__Various__ + + +__Light reading__ + + + +__Git tools and sites__ + + +## Releases + + +## Credits + +This edition of Git Rev News was curated by +Christian Couder <>, +Jakub Narębski <>, +Markus Jansen <> and +Kaartic Sivaraam <> +with help from XXX. From 72bd95c2b7dededa821ed78cbe4ec1b2b1a125b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Nar=C4=99bski?= Date: Sun, 2 Mar 2025 15:38:02 +0100 Subject: [PATCH 116/227] rn-120: Fix formatting error --- _posts/2025-02-28-edition-120.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/2025-02-28-edition-120.markdown b/_posts/2025-02-28-edition-120.markdown index 81721d679..7e0a12e98 100644 --- a/_posts/2025-02-28-edition-120.markdown +++ b/_posts/2025-02-28-edition-120.markdown @@ -261,7 +261,7 @@ __Various__ [idea page](https://git.github.io/SoC-2025-Ideas/), and volunteers to (co-)mentor are still welcome. Feel free to join the discussion in the [corresponding thread](http://public-inbox.org/git/6C29409D-691B-471F-B08C-83E14D35EE13@gmail.com/T/#mb087c1b0ed06fcbd56d4ffa320efbeb42fd4983f). Also, feel free to spread the word about Git’s participation. -+ [GitHub - Repositories – Updated insight views (General Availability)(https://github.blog/changelog/2025-02-25-repositories-updated-insight-views-general-availability/) ++ [GitHub - Repositories – Updated insight views (General Availability)](https://github.blog/changelog/2025-02-25-repositories-updated-insight-views-general-availability/) in GitHub Changelog. From 993959817f60083b19374ce9a474b58082998293 Mon Sep 17 00:00:00 2001 From: Markus Jansen Date: Sun, 2 Mar 2025 16:45:18 +0100 Subject: [PATCH 117/227] Tiny fixes, part 2. --- _posts/2025-02-28-edition-120.markdown | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/_posts/2025-02-28-edition-120.markdown b/_posts/2025-02-28-edition-120.markdown index 7e0a12e98..cea9555b9 100644 --- a/_posts/2025-02-28-edition-120.markdown +++ b/_posts/2025-02-28-edition-120.markdown @@ -272,9 +272,9 @@ __Light reading__ Post by Scott Chacon on GitButler Blog. + [How Core Git Developers Configure Git](https://blog.gitbutler.com/how-git-core-devs-configure-git/) by Scott Chacon on GitButler Blog. - + See also [Popular git config options](https://jvns.ca/blog/2024/02/16/popular-git-config-options/) + + See also [Popular `git config` options](https://jvns.ca/blog/2024/02/16/popular-git-config-options/) by Julia Evans on her blog, which was mentioned in [Git Rev News Edition #108](https://git.github.io/rev_news/2024/02/29/edition-108/). -+ [How to do patch-based review with git range-diff](https://blog.gitbutler.com/interdiff-review-with-git-range-diff/) ++ [How to do patch-based review with `git range-diff`](https://blog.gitbutler.com/interdiff-review-with-git-range-diff/) by Scott Chacon on GitButler Blog. + [Markdown's Big Brother: Say Hello to AsciiDoc](https://www.git-tower.com/blog/asciidoc-quick-guide) by Marvin Blome on Git-Tower Blog. @@ -307,8 +307,8 @@ __Git tools and sites__ + [Jujutsu (`jj`)](https://jj-vcs.github.io/jj/), a Git-compatible version control system, written in Rust, was first mentioned in [Git Rev News Edition #85](https://git.github.io/rev_news/2022/03/31/edition-85/). + [Beej's Guide to Git](https://beej.us/guide/bggit/). -+ [Gookme](https://lmaxence.github.io/gookme/) is simple and easy-to-use, - yet powerful and language agnostic git hook manager for [monorepos](https://monorepo.tools/). ++ [Gookme](https://lmaxence.github.io/gookme/) is a simple and easy-to-use, + yet powerful and language agnostic Git hook manager for [monorepos](https://monorepo.tools/). Successor of Mookme. Written in Go, under MIT license. From 86bfe15aaa0af225d8401051876cd6e3a92efa51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20N=C4=9Bmec?= Date: Mon, 3 Mar 2025 15:52:29 +0100 Subject: [PATCH 118/227] rn-120: fix a typo --- _posts/2025-02-28-edition-120.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/2025-02-28-edition-120.markdown b/_posts/2025-02-28-edition-120.markdown index cea9555b9..8ad9194cd 100644 --- a/_posts/2025-02-28-edition-120.markdown +++ b/_posts/2025-02-28-edition-120.markdown @@ -281,7 +281,7 @@ __Light reading__ + Another similar file format for textual data and technical documentation is [reStructuredText](https://docutils.sourceforge.io/rst.html) (RST, ReST, or reST). It is used, among others, by the Python programming language community, - and is is part of the Docutils project of the Python Doc-SIG. + and is part of the Docutils project of the Python Doc-SIG. + [Understanding the Trunk-Based Development Workflow](https://www.git-tower.com/blog/trunk-based-development) by Bruno Brito on Git-Tower Blog (2024). + See also the site, From da7c38b05735193428dbb1b52587676f963b6e6b Mon Sep 17 00:00:00 2001 From: Lucas Seiki Oshiro Date: Wed, 5 Mar 2025 11:09:40 -0300 Subject: [PATCH 119/227] Microproject Info: replace [Mentoring][PATCH] by [Mentoring PATCH] --- General-Microproject-Information.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/General-Microproject-Information.md b/General-Microproject-Information.md index 8d0a51429..67e00e590 100644 --- a/General-Microproject-Information.md +++ b/General-Microproject-Information.md @@ -39,7 +39,7 @@ well using the Git development process. It is *expected* that what you send will need several rounds of reviews and discussions. If you are not sure at all about a patch you -can put "[GSoC][RFC/PATCH]" or "[Outreachy][RFC/PATCH]", depending on +can put "[GSoC RFC/PATCH]" or "[Outreachy RFC/PATCH]", depending on the mentoring program you are applying for, at the beginning of its subject. @@ -140,8 +140,8 @@ the following steps: [submitGit](https://submitgit.herokuapp.com/). When you submit your patch, please mention that you plan to apply - for the GSoC or Outreachy. You can use "[GSoC][PATCH ...]" or - "[Outreachy][PATCH ...]" in the subject of the emails you send for + for the GSoC or Outreachy. You can use "[GSoC PATCH ...]" or + "[Outreachy PATCH ...]" in the subject of the emails you send for that purpose. This will ensure that we take special care not to overlook your application among the large pile of others. @@ -173,7 +173,7 @@ rewriting a small amount of code, your patch should change only "foo.c" and "foo.h". If you change a test file, the title of your patch (after the -"[GSoC][PATCH ...]" or "[Outreachy][PATCH ...]" part) should start +"[GSoC PATCH ...]" or "[Outreachy PATCH ...]" part) should start with "tXXXX: " where tXXXX is the start of the filename of the test script you change. If you change "foo.c" or "foo.h", the title of your patch should probably start with "foo: ". From 25903cc9e13763629bf61dd51cf603486abbd320 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 14 Mar 2025 16:40:45 +0100 Subject: [PATCH 120/227] Hacking-Git: remove mention of the Review Club --- Hacking-Git.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hacking-Git.md b/Hacking-Git.md index a89ff8e1f..62fd4f231 100644 --- a/Hacking-Git.md +++ b/Hacking-Git.md @@ -80,7 +80,7 @@ suggest improvements. Thanks! * [Junio's "What's cooking in git.git" emails](https://lore.kernel.org/git/?q=s%3A%22What%27s+cooking+in+git.git%22) list the status of various development topics. -* [Git's release calendar](https://tinyurl.com/gitCal) shows the planned release cycles, the maintainer's planned offline time, the Review Club meetings and possibly other events. +* [Git's release calendar](https://tinyurl.com/gitCal) shows the planned release cycles, the maintainer's planned offline time, and possibly other events. * [Git Rev News](https://git.github.io/rev_news/archive/) newsletter. From 37cdd88e87b3ce9a709886604ab9bb3e2c093ea2 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 14 Mar 2025 16:48:04 +0100 Subject: [PATCH 121/227] Hacking-Git: add an entry to build with Meson --- Hacking-Git.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Hacking-Git.md b/Hacking-Git.md index 62fd4f231..f553e86d8 100644 --- a/Hacking-Git.md +++ b/Hacking-Git.md @@ -18,7 +18,9 @@ suggest improvements. Thanks! ## Building Git -* ["`INSTALL`"](https://github.com/git/git/blob/master/INSTALL) +* ["`INSTALL`"](https://github.com/git/git/blob/master/INSTALL) to build using [Make](https://www.gnu.org/software/make/). + +* ["`meson.build`"](https://github.com/git/git/blob/master/meson.build) to build using [Meson](https://mesonbuild.com/). * ["Installing from Source"](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git#_installing_from_source) in the Pro Git book From af98455d7b0d0f61e8602315dd53a078da7e8510 Mon Sep 17 00:00:00 2001 From: Kaartic Sivaraam Date: Sat, 15 Mar 2025 17:23:56 +0530 Subject: [PATCH 122/227] rn-121: include interview with Peter Krefting --- rev_news/drafts/edition-121.md | 57 ++++++++++++++++++++++++++++++++-- 1 file changed, 54 insertions(+), 3 deletions(-) diff --git a/rev_news/drafts/edition-121.md b/rev_news/drafts/edition-121.md index 2cc724afc..956aaf179 100644 --- a/rev_news/drafts/edition-121.md +++ b/rev_news/drafts/edition-121.md @@ -29,9 +29,60 @@ This edition covers what happened during the months of February 2025 and March 2 ### Support --> - +## Developer Spotlight: Peter Krefting + +* **Who are you and what do you do?** + + My name is Peter Krefting and I am a software engineer. Hailing from Sweden, + I moved to Norway for my first job, at Opera Software, mostly working on + internals such as Unicode support and internal libraries. I ended up staying + in Norway and am currently working for a small company providing monitoring + equipment for digital TV. + +* **What are you doing on the Git project these days, and why?** + + My answer to these two are the same, I am the maintainer of the + [Swedish translation of Git](https://github.com/git-l10n/git-po/blob/master/po/sv.po). + I like having software running in my own language, and sometimes + you have to take matters in your own hands. + +* **If you could get a team of expert developers to work full time on + something in Git for a full year, what would it be?** + + I think [`git gui`](https://git-scm.com/docs/git-gui) and + [gitk](https://git-scm.com/docs/gitk) could need some extra love, + these are my daily drivers, in addition to the command line. + +* **Is there something that developers could do to ease the life of + translators?** + + My main gripe is using library function names as verbs, + like "cannot fsync". That's hard to read even in the original + language, even for a C developer like myself. + +* **What is your favorite Git-related tool/library, outside of + Git itself?** + + I like simple and clean interfaces, so using [cgit](https://wiki.archlinux.org/title/Cgit) + to visualize history on a web server is very nice. + +* **What is your toolbox for interacting with the mailing list and for + development of Git?** + + I mostly just read the mailing list, and only a small percentage of the + posts to it; the localization is handled through [GitHub pull requests](https://github.com/git-l10n/git-po/pulls?q=is%3Apr), + so that's where that work happens. The few patches I have sent to the + mailing list have been very manual, using `git format-patch` and + the [Alpine mail client](https://alpineapp.email/). + +* **What is your advice for people who want to start Git development? + Where and how should they start?** + + Find some small part you want to improve, and work on that. Git is a + fairly complex piece of software, implemented in several different + languages, making it hard to get an overview. I most definitely do not, + even if I have read (and translated) most of the user-visible strings. + ## Other News From 5253a9d63cf934e049a5b06fc355be8a31520af8 Mon Sep 17 00:00:00 2001 From: Kaartic Sivaraam Date: Sat, 15 Mar 2025 17:30:09 +0530 Subject: [PATCH 123/227] rn-121: correct monospaces in some places --- rev_news/drafts/edition-121.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rev_news/drafts/edition-121.md b/rev_news/drafts/edition-121.md index 956aaf179..aa58a7f82 100644 --- a/rev_news/drafts/edition-121.md +++ b/rev_news/drafts/edition-121.md @@ -50,14 +50,14 @@ This edition covers what happened during the months of February 2025 and March 2 something in Git for a full year, what would it be?** I think [`git gui`](https://git-scm.com/docs/git-gui) and - [gitk](https://git-scm.com/docs/gitk) could need some extra love, + [`gitk`](https://git-scm.com/docs/gitk) could need some extra love, these are my daily drivers, in addition to the command line. * **Is there something that developers could do to ease the life of translators?** My main gripe is using library function names as verbs, - like "cannot fsync". That's hard to read even in the original + like `cannot fsync`. That's hard to read even in the original language, even for a C developer like myself. * **What is your favorite Git-related tool/library, outside of From 51ce1c182415c00a973df4e9473bfafbd37b97e9 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Wed, 19 Mar 2025 16:54:37 +0100 Subject: [PATCH 124/227] Replace outdated links to Git for Windows' wiki Git for Windows' wiki pages were migrated in https://github.com/git-for-windows/git-for-windows.github.io/pull/59. --- Hacking-Git.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hacking-Git.md b/Hacking-Git.md index f553e86d8..9320fd893 100644 --- a/Hacking-Git.md +++ b/Hacking-Git.md @@ -56,7 +56,7 @@ suggest improvements. Thanks! * ["`SubmittingPatches`"](https://git-scm.com/docs/SubmittingPatches/) -* [Git for Windows' "Good commits"](https://github.com/git-for-windows/git/wiki/Good-commits) +* [Git for Windows' "Good commits"](https://gitforwindows.org/good-commits) ## Process related tools and sites @@ -108,7 +108,7 @@ suggest improvements. Thanks! ## Debugging -* [Git for Windows' Debugging Git](https://github.com/git-for-windows/git/wiki/Debugging-Git) +* [Git for Windows' Debugging Git](https://gitforwindows.org/debugging-git) * [Launching GDB explanations in CodingGuidelines](https://github.com/git/git/blob/v2.27.0/Documentation/CodingGuidelines#L441-L445) From f3800bf60962e2cd9f59bac3263bb82a3b002ca8 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sat, 22 Mar 2025 12:23:34 +0100 Subject: [PATCH 125/227] rn-91: fix bad date in filename --- ...2-09-31-edition-91.markdown => 2022-09-30-edition-91.markdown} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename _posts/{2022-09-31-edition-91.markdown => 2022-09-30-edition-91.markdown} (100%) diff --git a/_posts/2022-09-31-edition-91.markdown b/_posts/2022-09-30-edition-91.markdown similarity index 100% rename from _posts/2022-09-31-edition-91.markdown rename to _posts/2022-09-30-edition-91.markdown From ea4a0d939d22e87480bdcda22413b47de5d8169d Mon Sep 17 00:00:00 2001 From: Karthik Nayak Date: Mon, 24 Mar 2025 15:16:17 +0100 Subject: [PATCH 126/227] microprojects: add notes for the 2025 microproject list From an ongoing discussion on the mailing list [1], it would be nice to add some notes to the 'Modernize a test script' microproject. Let's do that. [1]: https://lore.kernel.org/all/CAPig+cRm+sc+Rk-4SuQ5CrPeZLG2Nzz9B7+6OZxCq7tV5mzmBA@mail.gmail.com/ --- SoC-2025-Microprojects.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/SoC-2025-Microprojects.md b/SoC-2025-Microprojects.md index 82d725166..67be0f91c 100644 --- a/SoC-2025-Microprojects.md +++ b/SoC-2025-Microprojects.md @@ -206,3 +206,8 @@ There should be only one kind of change per commit. For example if one of your commits indents test bodies with TABs, instead of spaces, then this should be the only kind of change in this commit. +#### Notes +- only work on t/t????-*.sh scripts. +- pick just one script (so as to avoid exhausting the pool for other candidates). +- only convert `test -[def]` instances which semantically are assertions + (i.e. used as part of a &&-chain). From 7c222eec935512b2dd63c2a5e72351910280bd1e Mon Sep 17 00:00:00 2001 From: Karthik Nayak Date: Tue, 25 Mar 2025 09:55:19 +0100 Subject: [PATCH 127/227] microprojects: clarify last note in modernization test scripts The last note in the modernization test scripts is a little vague. Clarify it to be more clear about which modernization point it is referring to from the ones in the quoted email. --- SoC-2025-Microprojects.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/SoC-2025-Microprojects.md b/SoC-2025-Microprojects.md index 67be0f91c..d382dbf69 100644 --- a/SoC-2025-Microprojects.md +++ b/SoC-2025-Microprojects.md @@ -207,7 +207,8 @@ of your commits indents test bodies with TABs, instead of spaces, then this should be the only kind of change in this commit. #### Notes -- only work on t/t????-*.sh scripts. +- only work on `t/t????-*.sh` scripts. - pick just one script (so as to avoid exhausting the pool for other candidates). -- only convert `test -[def]` instances which semantically are assertions - (i.e. used as part of a &&-chain). +- When converting `test -[def]` to use `test_path_exists()` and cousins + only convert instances which semantically are assertions (i.e. used as part + of a &&-chain). From 63f785c1710a4abbe9c8c0a4735259675cbd3ab0 Mon Sep 17 00:00:00 2001 From: ayu-ch Date: Thu, 27 Mar 2025 18:30:19 +0530 Subject: [PATCH 128/227] GSoC-participants: add GSoC 2024 participants to the list With GSoC 2025 approaching, adding GSoC 2024 participants will help new contributors understand their journey, making it easier for them to navigate the program and the project. Signed-off-by: ayu-ch --- GSoC-Participants.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/GSoC-Participants.md b/GSoC-Participants.md index 275c46c2b..df82c0b85 100644 --- a/GSoC-Participants.md +++ b/GSoC-Participants.md @@ -8,6 +8,17 @@ to Git via GSoC. +### 2024 + +1. Jialuo She [ [project](https://summerofcode.withgoogle.com/archive/2024/projects/ukm4PTEF) ] [ [final report](https://luolibrary.com/2024/08/25/GSoC-Final-Report/) ] [ [blog](https://luolibrary.com/) ] +2. Ghanshyam Thakkar [ [project](https://summerofcode.withgoogle.com/archive/2024/projects/e9C4rhrv) ] [ [final report](https://spectre10.github.io/posts/gsoc_final_report/) ] [ [blog](https://spectre10.github.io/) ] +3. Chandra Pratap [ [project](https://summerofcode.withgoogle.com/archive/2024/projects/tlh611d7) ] [ [final report](https://chand-ra.github.io/2024/08/24/GSoC-Final-Report.html) ] [ [blog](https://chand-ra.github.io/) ] + +#### References + +- [GSoC archive](https://summerofcode.withgoogle.com/archive/2024/organizations/git) +- [Rev News article](https://git.github.io/rev_news/2024/05/31/edition-111/) + ### 2023 1. Shuqi Liang [ [project](https://summerofcode.withgoogle.com/archive/2023/projects/Rkbc1Abe) ] [ [final report](https://cheskaqiqi.github.io/2023/08/22/Final/) ] [ [blog](https://cheskaqiqi.github.io/tags/GSoC/) ] From 3f596ae95b8115a967e9a99f3cd0a91bf9ab254e Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sun, 30 Mar 2025 10:42:51 +0200 Subject: [PATCH 129/227] rn-121: add releases --- rev_news/drafts/edition-121.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/rev_news/drafts/edition-121.md b/rev_news/drafts/edition-121.md index aa58a7f82..483509e2f 100644 --- a/rev_news/drafts/edition-121.md +++ b/rev_news/drafts/edition-121.md @@ -100,6 +100,31 @@ __Git tools and sites__ ## Releases ++ Git [2.49.0](https://public-inbox.org/git/xmqqfrjfilc8.fsf@gitster.g/), +[2.49.0-rc2](https://public-inbox.org/git/xmqq34fk958s.fsf@gitster.g/), +[2.49.0-rc1](https://public-inbox.org/git/xmqqjz94r8p0.fsf@gitster.g/) ++ Git for Windows [2.49.0(1)](https://github.com/git-for-windows/git/releases/tag/v2.49.0.windows.1), +[2.49.0-rc2(1)](https://github.com/git-for-windows/git/releases/tag/v2.49.0-rc2.windows.1), +[2.49.0-rc1(1)](https://github.com/git-for-windows/git/releases/tag/v2.49.0-rc1.windows.1) ++ GitLab [17.10.1, 17.9.3, 17.8.6](https://about.gitlab.com/releases/2025/03/26/patch-release-gitlab-17-10-1-released/), +[17.10](https://about.gitlab.com/releases/2025/03/20/gitlab-17-10-released/), +[17.9.2, 17.8.5, 17.7.7](https://about.gitlab.com/releases/2025/03/12/patch-release-gitlab-17-9-2-released/) ++ GitHub Enterprise [3.16.1](https://help.github.com/enterprise-server@3.16/admin/release-notes#3.16.1), +[3.15.5](https://help.github.com/enterprise-server@3.15/admin/release-notes#3.15.5), +[3.14.10](https://help.github.com/enterprise-server@3.14/admin/release-notes#3.14.10), +[3.13.13](https://help.github.com/enterprise-server@3.13/admin/release-notes#3.13.13), +[3.12.17](https://help.github.com/enterprise-server@3.12/admin/release-notes#3.12.17), +[3.16.0](https://help.github.com/enterprise-server@3.16/admin/release-notes#3.16.0), +[3.15.4](https://help.github.com/enterprise-server@3.15/admin/release-notes#3.15.4), +[3.14.9](https://help.github.com/enterprise-server@3.14/admin/release-notes#3.14.9), +[3.13.12](https://help.github.com/enterprise-server@3.13/admin/release-notes#3.13.12), +[3.12.16](https://help.github.com/enterprise-server@3.12/admin/release-notes#3.12.16) ++ GitKraken [10.8.0](https://help.gitkraken.com/gitkraken-client/current/) ++ GitHub Desktop [3.4.18](https://desktop.github.com/release-notes/) ++ git-credential-azure [0.3.1](https://github.com/hickford/git-credential-azure/releases/tag/v0.3.1) ++ git-credential-oauth [0.15.0](https://github.com/hickford/git-credential-oauth/releases/tag/v0.15.0) ++ GitButler [0.14.14](https://github.com/gitbutlerapp/gitbutler/releases/tag/release/0.14.14), +[0.14.13](https://github.com/gitbutlerapp/gitbutler/releases/tag/release/0.14.13) ## Credits From 4b1f05cf91d7ffd7f7ab9f152db105f992d688da Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sun, 30 Mar 2025 11:30:08 +0200 Subject: [PATCH 130/227] rn-121: add Outreachy internship article --- rev_news/drafts/edition-121.md | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/rev_news/drafts/edition-121.md b/rev_news/drafts/edition-121.md index 483509e2f..7831ec696 100644 --- a/rev_news/drafts/edition-121.md +++ b/rev_news/drafts/edition-121.md @@ -17,9 +17,24 @@ This edition covers what happened during the months of February 2025 and March 2 ## Discussions - + +* [Git participated in the December 2024 Outreachy round](https://www.outreachy.org/alums/2024-12/) + + All the Outreachy interns have successfully completed their + internship: + + - Seyi Kuforiji worked on the "Convert unit tests to use the clar + testing framework" project, mentored by Patrick Steinhardt and + Phillip Wood. See + [his completion email](https://lore.kernel.org/git/CAGedMtcLRjr0GVNYmUU_tacrA0aRvOCYFGyOy0FACTBL=X3cwA@mail.gmail.com/) + and + [his retrospect blog post](https://seyi-kuforiji-902b48.gitlab.io/posts/a-retrospect-on-new-test-conversions). + + - Usman Akinyemi worked on the "Finish adding a 'os-version' + capability to Git protocol v2" project, mentored by Christian + Couder. See + [his completion blog post](https://uniqueusman.hashnode.dev/my-outreachy-internship-experience-at-git). __Git tools and sites__ ++ [git-who](https://github.com/sinclairtarget/git-who) is a command-line tool for finding + the people responsible for entire components or subsystems in a codebase. + You can think of `git-who` sort of like `git blame` but for file trees rather than individual files. + Written in Go, under MIT license. ++ [chrondb](https://chrondb.moclojer.com/) ([repo](https://github.com/moclojer/chrondb)) + is a chronological key/value database, + where storing data is based on database-shaped `git` (core) architecture and Lucene for indexing. + Written in Clojure, uses MIT license. ++ [Calendar.txt](https://terokarvinen.com/2021/calendar-txt/) is a solution + to keep your calendar in a plain text file. + One of it's advantages is that it is versionable: because it's plain text, you can keep it in git. + You can also easily take diff of calendar files, as it's one day one line. + + See also [Todo.txt](http://todotxt.org/) to keep your TODO list in a plain text file, + and tools like [Taskwarrior](https://taskwarrior.org/), and + [Plain Text Accounting (PTA)](https://plaintextaccounting.org/). ++ [YSK there are open-source (gamified) tutorials to learn git](https://programming.dev/post/26285997) + post provides list of some tutorials and interactive learning tools, like + + [Oh My Git!](https://ohmygit.org/), an open source game about learning Git, + first mentioned in [Git Rev News Edition #72](https://git.github.io/rev_news/2021/02/27/edition-72/). + + [Learn Git Branching](http://learngitbranching.js.org/), visual and interactive way to learn Git on the web, + first mentioned in [Git Rev News Edition #30](https://git.github.io/rev_news/2017/08/16/edition-30/). + + [Git Gud: Master Git Through Play](https://www.gitmastery.me/), a modern website + to learn Git commands and concepts through an interactive game. + + [Git+ Coach](https://github.com/vishal2376/git-coach), a free education app + designed to help users learn Git and its commands. Written in Kotlin, for Android. + + [Git-it](https://github.com/jlord/git-it-electron) is a desktop (Mac, Windows and Linux) Electron app + that teaches you how to use Git and GitHub on the command line. + First mentioned in [Git Rev News Edition #7](https://git.github.io/rev_news/2015/09/09/edition-7/) ++ [BeanHub](https://beanhub.io/) is a modern accounting book app + based on the most popular open source version control system Git + and text-based double entry accounting book software [Beancount](https://beancount.github.io/docs/index.html). + [Mostly open-sourced](https://beanhub.io/open-source/). See also the following posts by Fang-Pen Lin: + + [My Beancount books are 95% automatic after 3 years](https://fangpenlin.com/posts/2024/12/30/my-beancount-books-are-95-percent-automatic/). + + [How BeanHub works part 1: the danger of processing Beancount data with sandbox](https://beanhub.io/blog/2024/04/23/how-beanhub-works-part1-sandboxing/). + + [How BeanHub works part 2: large-scale auditable Git repository system based on container layers](https://beanhub.io/blog/2024/06/26/how-beanhub-works-part2-layer-based-git-repos/). + + ## Releases From 25d11a279dd301f36cad1d0d3bccfbb63ae847ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Nar=C4=99bski?= Date: Tue, 1 Apr 2025 09:02:37 +0200 Subject: [PATCH 150/227] rn-121: Add note to link about "commit 0" --- rev_news/drafts/edition-121.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-121.md b/rev_news/drafts/edition-121.md index f8bfcf0fb..1c0f54f6b 100644 --- a/rev_news/drafts/edition-121.md +++ b/rev_news/drafts/edition-121.md @@ -310,7 +310,12 @@ __Light reading__ by Kissaki on programming\.dev Lemmy instance.
[Lemmy](https://join-lemmy.org/docs/index.html) is self-hosted, federated social link aggregation and discussion forum, somewhat similar to Reddit. - + + Note that there are tools like [git-vain](https://git.anna.lgbt/anna/git-vain) + and [git-vanity-sha](https://github.com/mattbaker/git-vanity-sha), + most recently listed in [Git Rev News Edition #103](https://git.github.io/rev_news/2023/09/30/edition-103/), + which can be used to make SHA-1 hash of commit start with specific pattern, like `000000`, + by manipulating commit date or commit message. + + ++ [What Git Clone REALLY Does (and why it matters)](https://www.youtube.com/watch?v=zigbUJHBsL4) + on The Modern Coder YouTube channel, 3:16 minutes long. + It's made by @JackLot who created the [LearnGit.io](https://learngit.io) resource, + which site was mentioned in [Git Rev News Edition #108](https://git.github.io/rev_news/2024/02/29/edition-108/). ++ [Git Interview Part 1: Easy | Ep. 8 Bits and Booze](https://www.youtube.com/watch?v=SdSllNeQuVc) [29:09], and
+ [Git Interview Part 2: Hard | Ep. 9 Bits and Booze](https://www.youtube.com/watch?v=FbW9wlve8sI) [17:45],
+ on GitButler YouTube channel. Join Nico as he (mock) interviews Scott [Chacon] about Git. + __Git tools and sites__ @@ -382,7 +389,6 @@ __Git tools and sites__ + [My Beancount books are 95% automatic after 3 years](https://fangpenlin.com/posts/2024/12/30/my-beancount-books-are-95-percent-automatic/). + [How BeanHub works part 1: the danger of processing Beancount data with sandbox](https://beanhub.io/blog/2024/04/23/how-beanhub-works-part1-sandboxing/). + [How BeanHub works part 2: large-scale auditable Git repository system based on container layers](https://beanhub.io/blog/2024/06/26/how-beanhub-works-part2-layer-based-git-repos/). - ## Releases From 221a761bee4e1daf54581ac727c4a049e3fa503f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Nar=C4=99bski?= Date: Tue, 1 Apr 2025 12:47:06 +0200 Subject: [PATCH 160/227] rn-121: Add link to a article about Gerrit --- rev_news/drafts/edition-121.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rev_news/drafts/edition-121.md b/rev_news/drafts/edition-121.md index 80e645990..7a0f095d1 100644 --- a/rev_news/drafts/edition-121.md +++ b/rev_news/drafts/edition-121.md @@ -272,6 +272,12 @@ __Light reading__ because it was easier to justify its adoption for the rest of the team. + You can find a definition of "monorepo" and a list of various tools on the [Monorepo.tools](https://monorepo.tools/) site, which was first mentioned in [Git Rev News Edition #84](https://git.github.io/rev_news/2022/02/28/edition-84/). ++ [Gerrit Code Review: A How-To Guide for new users!](https://gitenterprise.me/2025/03/10/gerrit-code-review-a-how-to-guide-for-new-users/) + by Daniele Sassoli on GerritForge Blog. See also: + + [How GitHub taught the world code review the wrong way](https://medium.com/@danielesassoli/how-github-taught-the-world-code-reviews-the-wrong-way-f840a072f5be) + by Daniele Sassoli (2024) on his Medium-based blog. + + [Pull requests / Collaborate with pull requests / Getting started / Helping others review your changes](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/getting-started/helping-others-review-your-changes) + on GitHub Docs. + [TIL: Hugo's GitInfo](https://blog.erethon.com/log/2025-03-03-hugo-git-info/) by Dionysis Grigoropoulos, about the [GitInfo](https://gohugo.io/methods/page/gitinfo/) method of [Hugo](https://gohugo.io/), the static site generator From 439cefe0f48aaf715e05ff19aeff9e15f903d646 Mon Sep 17 00:00:00 2001 From: Markus Jansen Date: Tue, 1 Apr 2025 15:20:44 +0200 Subject: [PATCH 161/227] Supplied a few tiny punctuation fixes and rephrased one blog post description; please scrutinize. --- rev_news/drafts/edition-121.md | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/rev_news/drafts/edition-121.md b/rev_news/drafts/edition-121.md index 7a0f095d1..61312b8fc 100644 --- a/rev_news/drafts/edition-121.md +++ b/rev_news/drafts/edition-121.md @@ -234,7 +234,7 @@ __Various__ + [Highlights from Git 2.49](https://github.blog/open-source/git/highlights-from-git-2-49/) by Taylor Blau on GitHub Blog. Mentioned items include faster packing with name-hash v2, backfilling historical blobs in partial clones, building Git with zlib-ng, - and libgit-sys and libgit Rust crates. + and the libgit-sys and libgit Rust crates. __Light reading__ @@ -242,7 +242,7 @@ __Light reading__ + [Going down the rabbit hole of Git's new bundle-uri](https://blog.gitbutler.com/going-down-the-rabbit-hole-of-gits-new-bundle-uri/) by Scott Chacon on GitButler blog.
The [`bundle-uri`](https://git-scm.com/docs/bundle-uri) was mentioned in passing in [Git Rev News Edition #95](https://git.github.io/rev_news/2023/01/31/edition-95/) - (in _"Developer Spotlight"_), and in [Edition #104](https://git.github.io/rev_news/2023/10/31/edition-104/) + (in _"Developer Spotlight"_) and in [Edition #104](https://git.github.io/rev_news/2023/10/31/edition-104/) (in _"Git tools and sites"_, when mentioning [git-bundle-server](https://github.com/git-ecosystem/git-bundle-server)). + [No Longer My Favorite Git Commit](https://mtlynch.io/no-longer-my-favorite-git-commit/) by Michael Lynch on his blog, talks about how one could _improve_ the commit message @@ -267,7 +267,8 @@ __Light reading__ by Mohammad Sajid Anwar (MANWAR) on The Weekly Challenge blog. The blog post shows how to use `git bisect` on a detailed example (in Perl). + [Python monorepo with uv and pex](https://chrismati.cz/posts/uv-pex-monorepo/) - by Christoph Pröschel on his blog. The solution of using regular Python tooling + by Christoph Pröschel on his blog. The article discusses the benefits of a + lightweight solution built with regular Python tooling over, for example, the [Pants](https://www.pantsbuild.org/) build tool, because it was easier to justify its adoption for the rest of the team. + You can find a definition of "monorepo" and a list of various tools on the [Monorepo.tools](https://monorepo.tools/) site, @@ -353,9 +354,9 @@ __Easy watching__ on The Modern Coder YouTube channel, 3:16 minutes long. It's made by @JackLot who created the [LearnGit.io](https://learngit.io) resource, which site was mentioned in [Git Rev News Edition #108](https://git.github.io/rev_news/2024/02/29/edition-108/). -+ [Git Interview Part 1: Easy | Ep. 8 Bits and Booze](https://www.youtube.com/watch?v=SdSllNeQuVc) [29:09], and
- [Git Interview Part 2: Hard | Ep. 9 Bits and Booze](https://www.youtube.com/watch?v=FbW9wlve8sI) [17:45],
- on GitButler YouTube channel. Join Nico as he (mock) interviews Scott [Chacon] about Git. ++ [Git Interview Part 1: Easy | Ep. 8 Bits and Booze](https://www.youtube.com/watch?v=SdSllNeQuVc) [29:09] and
+ [Git Interview Part 2: Hard | Ep. 9 Bits and Booze](https://www.youtube.com/watch?v=FbW9wlve8sI) [17:45]
+ on the GitButler YouTube channel. Join Nico as he (mock) interviews Scott [Chacon] about Git. __Git tools and sites__ @@ -373,7 +374,7 @@ __Git tools and sites__ One of its advantages is that it is versionable: because it's plain text, you can keep it in Git. You can also easily take diffs of calendar files, as it's one day one line. + See also [Todo.txt](http://todotxt.org/) to keep your TODO list in a plain text file, - and tools like [Taskwarrior](https://taskwarrior.org/), and + and tools like [Taskwarrior](https://taskwarrior.org/) and [Plain Text Accounting (PTA)](https://plaintextaccounting.org/). + [YSK there are open-source (gamified) tutorials to learn git](https://programming.dev/post/26285997) provides a list of some tutorials and interactive learning tools, including: @@ -387,7 +388,7 @@ __Git tools and sites__ designed to help users learn Git and its commands. Written in Kotlin, for Android. + [Git-it](https://github.com/jlord/git-it-electron) is a desktop (Mac, Windows and Linux) Electron app that teaches you how to use Git and GitHub on the command line. - First mentioned in [Git Rev News Edition #7](https://git.github.io/rev_news/2015/09/09/edition-7/) + First mentioned in [Git Rev News Edition #7](https://git.github.io/rev_news/2015/09/09/edition-7/). + [BeanHub](https://beanhub.io/) is a modern accounting book app based on the most popular open source version control system Git and the text-based double entry accounting book software [Beancount](https://beancount.github.io/docs/index.html). From bd69d16d467e6103eda89f98d18fdda9eca4623b Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Tue, 1 Apr 2025 22:28:35 +0200 Subject: [PATCH 162/227] rn-121: add text statistics for articles --- rev_news/drafts/edition-121.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/rev_news/drafts/edition-121.md b/rev_news/drafts/edition-121.md index 61312b8fc..5aa1edc05 100644 --- a/rev_news/drafts/edition-121.md +++ b/rev_news/drafts/edition-121.md @@ -94,6 +94,24 @@ This edition covers what happened during the months of February and March 2025. - Reviews: 0.66 - Support: 0.57 + Text Statistics: + + - Total words: 100,434 + - Total lines: 14,090 + - Total paragraphs: 3,097 + + Average per article: + + - Words: 395.4 + - Lines: 55.5 + - Paragraphs: 12.2 + + Total words per section: + + - General: 29,220 words + - Reviews: 35,912 words + - Support: 35,302 words + + Among those long articles, 16 articles were written by people outside the editor team. Big thanks to them! The top 3 is: From 164c78b1e3e7376de05e8a1b90e928d348782e04 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Tue, 1 Apr 2025 22:33:37 +0200 Subject: [PATCH 163/227] Publish rn-121 in _posts/ --- .../edition-121.md => _posts/2025-03-31-edition-121.markdown | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename rev_news/drafts/edition-121.md => _posts/2025-03-31-edition-121.markdown (100%) diff --git a/rev_news/drafts/edition-121.md b/_posts/2025-03-31-edition-121.markdown similarity index 100% rename from rev_news/drafts/edition-121.md rename to _posts/2025-03-31-edition-121.markdown From cf82030e9e531f979b7cada74c2cd5bdcab4a7be Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Tue, 1 Apr 2025 22:33:37 +0200 Subject: [PATCH 164/227] Add draft for rn-122 --- rev_news/drafts/edition-122.md | 60 ++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 rev_news/drafts/edition-122.md diff --git a/rev_news/drafts/edition-122.md b/rev_news/drafts/edition-122.md new file mode 100644 index 000000000..5c7c50e26 --- /dev/null +++ b/rev_news/drafts/edition-122.md @@ -0,0 +1,60 @@ +--- +title: Git Rev News Edition 122 (April 30th, 2025) +layout: default +date: 2025-04-30 12:06:51 +0100 +author: chriscool +categories: [news] +navbar: false +--- + +## Git Rev News: Edition 122 (April 30th, 2025) + +Welcome to the 122nd edition of [Git Rev News](https://git.github.io/rev_news/rev_news/), +a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to +subscribe, see [the Git Rev News page](https://git.github.io/rev_news/rev_news/) on [git.github.io](http://git.github.io). + +This edition covers what happened during the months of March 2025 and April 2025. + +## Discussions + + + + + + + + + +## Other News + +__Various__ + + +__Light reading__ + + + +__Git tools and sites__ + + +## Releases + + +## Credits + +This edition of Git Rev News was curated by +Christian Couder <>, +Jakub Narębski <>, +Markus Jansen <> and +Kaartic Sivaraam <> +with help from XXX. From fb1299f7fd6ac7b77e10f15fcc56b52727fd12e1 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 2 Apr 2025 15:02:38 +0200 Subject: [PATCH 165/227] rn-121: fix 'Light reading'/'Easy watching' issue --- _posts/2025-03-31-edition-121.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/2025-03-31-edition-121.markdown b/_posts/2025-03-31-edition-121.markdown index 5aa1edc05..c0691b936 100644 --- a/_posts/2025-03-31-edition-121.markdown +++ b/_posts/2025-03-31-edition-121.markdown @@ -153,7 +153,7 @@ This edition covers what happened during the months of February and March 2025. with 635 links; around 7.06% of entries mention previous editions. - 20 entries in "Events" over 12 editions with 39 links - - 15 entries in "Light reading" over 12 editions + - 15 entries in "Easy watching" over 12 editions with 31 links; of those, 3 entries mention previous editions. There were quite a few one-off names of sub-lists, like From 6bb8a161edcc47c47d33e42a937bd22dc9e16c80 Mon Sep 17 00:00:00 2001 From: Jason Novinger Date: Wed, 2 Apr 2025 13:59:09 -0500 Subject: [PATCH 166/227] Update type in Michael Lynch's name in edition #121 --- _posts/2025-03-31-edition-121.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/2025-03-31-edition-121.markdown b/_posts/2025-03-31-edition-121.markdown index c0691b936..d96634924 100644 --- a/_posts/2025-03-31-edition-121.markdown +++ b/_posts/2025-03-31-edition-121.markdown @@ -270,7 +270,7 @@ __Light reading__ + The article mentions the [How to Write Useful Commit Messages](https://refactoringenglish.com/chapters/commit-messages/) guide by Michael Lynch, one of the sample chapters for his prospective book, _"Refactoring English: Effective writing for software developers"_. - + Another post by Michael Lunch, [How to Make Your Code Reviewer Fall in Love with You](https://mtlynch.io/code-review-love/), + + Another post by Michael Lynch, [How to Make Your Code Reviewer Fall in Love with You](https://mtlynch.io/code-review-love/), was mentioned in [Git Rev News Edition #70](https://git.github.io/rev_news/2020/12/26/edition-70/). + [19000 curl commits](https://daniel.haxx.se/blog/2025/03/14/19000-curl-commits/) by Daniel Stenberg on his blog, presenting some statistics about those commits. From 0c1dde26394dfa9701969582084492eee9a03e78 Mon Sep 17 00:00:00 2001 From: Markus Jansen Date: Sun, 6 Apr 2025 15:33:04 +0200 Subject: [PATCH 167/227] Final tiny spelling fix. --- _posts/2025-03-31-edition-121.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/2025-03-31-edition-121.markdown b/_posts/2025-03-31-edition-121.markdown index d96634924..ce754e063 100644 --- a/_posts/2025-03-31-edition-121.markdown +++ b/_posts/2025-03-31-edition-121.markdown @@ -336,7 +336,7 @@ __Light reading__ + [Using Git Delta with Magit](https://scripter.co/using-git-delta-with-magit/) by Kaushal Modi (2022) on A Scripter's Notes. + [Delta](https://github.com/dandavison/delta) is a highly configurable command line utility - that makes the git diffs look better, while also syntax-highlighting the code in the diffs. + that makes the Git diffs look better, while also syntax-highlighting the code in the diffs. First mentioned in [Git Rev News Edition #86](https://git.github.io/rev_news/2022/04/30/edition-86/). + [Magit](https://magit.vc/) is a popular Emacs interface to Git, first mentioned (in passing) in [Git Rev News Edition #6](https://git.github.io/rev_news/2015/08/05/edition-6/). From 32645eb3d41743ccd4aca75dbd426867ae673d47 Mon Sep 17 00:00:00 2001 From: ayu-ch Date: Mon, 7 Apr 2025 13:30:34 +0530 Subject: [PATCH 168/227] Rename references from *.txt to *.adoc in documentation paths. Since the documentation in git is changed from *.txt to *.adoc format. Update references to reflect that change. Signed-off-by: ayu-ch --- Hacking-Git.md | 4 ++-- SoC-2019-Ideas.md | 2 +- SoC-2020-Ideas.md | 2 +- SoC-2024-Ideas.md | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Hacking-Git.md b/Hacking-Git.md index 9320fd893..c8e9fef2b 100644 --- a/Hacking-Git.md +++ b/Hacking-Git.md @@ -38,7 +38,7 @@ suggest improvements. Thanks! * ["My First Contribution"](https://git-scm.com/docs/MyFirstContribution) -* ["My First Object Walk"](https://github.com/git/git/blob/master/Documentation/MyFirstObjectWalk.txt) +* ["My First Object Walk"](https://github.com/git/git/blob/master/Documentation/MyFirstObjectWalk.adoc) * [Matheus' tutorial](https://matheustavares.gitlab.io/posts/first-steps-contributing-to-git) @@ -102,7 +102,7 @@ suggest improvements. Thanks! * [`gitworkflows`](https://git-scm.com/docs/gitworkflows) manual page -* ["How to maintain Git"](https://github.com/git/git/blob/master/Documentation/howto/maintain-git.txt) +* ["How to maintain Git"](https://github.com/git/git/blob/master/Documentation/howto/maintain-git.adoc) * ["How the Creators of Git do Branching"](https://hackernoon.com/how-the-creators-of-git-do-branches-e6fcc57270fb), and the associated [gitworkflow](https://github.com/rocketraman/gitworkflow) repository diff --git a/SoC-2019-Ideas.md b/SoC-2019-Ideas.md index bdb85074b..da3b6c8f3 100644 --- a/SoC-2019-Ideas.md +++ b/SoC-2019-Ideas.md @@ -137,7 +137,7 @@ See discussion in: - Possible mentors: Christian Couder, Thomas Gummerer A number of Git commands, like `git log`, can show commit information -in a configurable way using ["pretty" formats](https://github.com/git/git/blob/master/Documentation/pretty-formats.txt). +in a configurable way using ["pretty" formats](https://github.com/git/git/blob/master/Documentation/pretty-formats.adoc). Such formats though don't yet support some features that users would like, for example to display a log like the following: diff --git a/SoC-2020-Ideas.md b/SoC-2020-Ideas.md index b6ea44d9c..ce6d43cd6 100644 --- a/SoC-2020-Ideas.md +++ b/SoC-2020-Ideas.md @@ -45,7 +45,7 @@ See discussion in: A number of Git commands, like `git log`, can show commit information in a configurable way using -["pretty" formats](https://github.com/git/git/blob/master/Documentation/pretty-formats.txt). +["pretty" formats](https://github.com/git/git/blob/master/Documentation/pretty-formats.adoc). Such formats though don't yet support some features that users would like, for example to display a log like the following: diff --git a/SoC-2024-Ideas.md b/SoC-2024-Ideas.md index 56cc38a44..041eba592 100644 --- a/SoC-2024-Ideas.md +++ b/SoC-2024-Ideas.md @@ -55,7 +55,7 @@ the reftable ones. - - - - - + - Expected Project Size: 175 hours or 350 hours @@ -77,7 +77,7 @@ the new framework. See: - this discussion - - + - - Expected Project Size: 175 hours or 350 hours From 3099fa012410c7b3c72155ab1d2669d28dbfac42 Mon Sep 17 00:00:00 2001 From: ayu-ch Date: Mon, 7 Apr 2025 16:31:22 +0530 Subject: [PATCH 169/227] Rename references from *.txt to *.adoc in Rev News editions. Since the documentation in git is changed from *.txt to *.adoc format. Update references in previous editions to reflect that change. Signed-off-by: ayu-ch --- _posts/2015-08-05-edition-6.markdown | 2 +- _posts/2017-12-20-edition-34.markdown | 2 +- _posts/2018-07-18-edition-41.markdown | 2 +- _posts/2018-08-22-edition-42.markdown | 2 +- _posts/2018-11-21-edition-45.markdown | 2 +- _posts/2019-06-28-edition-52.markdown | 4 ++-- _posts/2023-10-31-edition-104.markdown | 2 +- _posts/2024-04-30-edition-110.markdown | 2 +- _posts/2024-10-31-edition-116.markdown | 2 +- _posts/2024-12-31-edition-118.markdown | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/_posts/2015-08-05-edition-6.markdown b/_posts/2015-08-05-edition-6.markdown index 867700219..29965bb76 100644 --- a/_posts/2015-08-05-edition-6.markdown +++ b/_posts/2015-08-05-edition-6.markdown @@ -25,7 +25,7 @@ Git 2.5 is out! The project maintainer, Junio C. Hamano, has [shared his thought He goes on to talk about some of his favourite new features included in the release, such as a new short hand `branch@{push}` that "denotes the remote-tracking branch that tracks the branch at the remote the branch would be pushed to", and a new option `--ws-error-highlight` that can be used with `git diff` and friends to show whitespace breakages in deleted and context lines. -Be sure to see the post for more on the new features, or checkout the [release notes in the source](https://github.com/git/git/blob/master/Documentation/RelNotes/2.5.0.txt) for all the nitty gritty details. +Be sure to see the post for more on the new features, or checkout the [release notes in the source](https://github.com/git/git/blob/master/Documentation/RelNotes/2.5.0.adoc) for all the nitty gritty details. ### Did you know? diff --git a/_posts/2017-12-20-edition-34.markdown b/_posts/2017-12-20-edition-34.markdown index ee4c0a919..acff8d432 100644 --- a/_posts/2017-12-20-edition-34.markdown +++ b/_posts/2017-12-20-edition-34.markdown @@ -310,7 +310,7 @@ __Various__ * [Git Essentials, 2nd Edition](https://www.packtpub.com/application-development/git-essentials-second-edition) * [Git: Version Control for Everyone](https://www.packtpub.com/application-development/git-version-control-everyone) (which was [reviewed](https://git-blame.blogspot.com/2013/02/git-version-control-for-everyone.html) by Junio C Hamano on his blog) * [Discussions on Hacker News](https://news.ycombinator.com/item?id=15819033) - about [the hash transition plan](https://github.com/git/git/blob/master/Documentation/technical/hash-function-transition.txt). + about [the hash transition plan](https://github.com/git/git/blob/master/Documentation/technical/hash-function-transition.adoc). * [Protecting code integrity with PGP](https://github.com/lfit/itpol/blob/master/protecting-code-integrity.md) (beta), part of Useful IT Policies project * [Effortlessly maintain a high quality change log with Git notes](https://harrow.io/blog/effortlessly-maintain-a-high-quality-change-log-with-little-known-git-tricks/) by Lee Hambley diff --git a/_posts/2018-07-18-edition-41.markdown b/_posts/2018-07-18-edition-41.markdown index 27b6b3bdd..a06aecaef 100644 --- a/_posts/2018-07-18-edition-41.markdown +++ b/_posts/2018-07-18-edition-41.markdown @@ -36,7 +36,7 @@ With Brian's latest patches Git would work using NewHash, including passing the test suite, though it would be incompatible with current Git. -As the [hash function transition plan](https://github.com/git/git/blob/master/Documentation/technical/hash-function-transition.txt) +As the [hash function transition plan](https://github.com/git/git/blob/master/Documentation/technical/hash-function-transition.adoc) tells that a Git using NewHash should be able to communicate through fetching and pushing with a Git using SHA-1, the next step is to implement such kind of communication and that's what Brian started to diff --git a/_posts/2018-08-22-edition-42.markdown b/_posts/2018-08-22-edition-42.markdown index 6b23618c5..a1c955e74 100644 --- a/_posts/2018-08-22-edition-42.markdown +++ b/_posts/2018-08-22-edition-42.markdown @@ -25,7 +25,7 @@ This edition covers what happened during the month of July 2018. discussed the state of NewHash work, i.e. the process of selecting Git's next-generation hash function. [This discussion has concluded](https://public-inbox.org/git/20180724190136.GA5@0f3cdde9c159/) with the selection of SHA-256. An -[update to `hash-function-transition.txt` to change `NewHash` to `SHA-256`](https://github.com/git/git/blob/master/Documentation/technical/hash-function-transition.txt) +[update to `hash-function-transition.txt` to change `NewHash` to `SHA-256`](https://github.com/git/git/blob/master/Documentation/technical/hash-function-transition.adoc) is queued in the `next` branch. @@ -48,7 +48,7 @@ __Git tools and sites__ ## Releases - ++ Tower for Mac [13.0 (BETA)](https://www.git-tower.com/beta) ([Release blog post](https://www.git-tower.com/blog/tower-mac-13/)) ## Credits From 3214a2e80927cdc501fb71fccf2fb0b92dabd519 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Tue, 29 Apr 2025 21:46:07 +0200 Subject: [PATCH 173/227] rn-122: add releases --- rev_news/drafts/edition-122.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/rev_news/drafts/edition-122.md b/rev_news/drafts/edition-122.md index 5c7c50e26..eea3b8efb 100644 --- a/rev_news/drafts/edition-122.md +++ b/rev_news/drafts/edition-122.md @@ -49,6 +49,23 @@ __Git tools and sites__ ## Releases ++ GitHub Enterprise [3.16.2](https://docs.github.com/enterprise-server@3.16/admin/release-notes#3.16.2), +[3.15.6](https://docs.github.com/enterprise-server@3.15/admin/release-notes#3.15.6), +[3.14.11](https://docs.github.com/enterprise-server@3.14/admin/release-notes#3.14.11), +[3.13.14](https://docs.github.com/enterprise-server@3.13/admin/release-notes#3.13.14) ++ GitLab [17.11.1, 17.10.5, 17.9.7](https://about.gitlab.com/releases/2025/04/23/patch-release-gitlab-17-11-1-released/), +[17.11](https://about.gitlab.com/releases/2025/04/17/gitlab-17-11-released/), +[17.10.4, 17.9.6, 17.8.7](https://about.gitlab.com/releases/2025/04/09/patch-release-gitlab-17-10-4-released/), +[17.10.3](https://about.gitlab.com/releases/2025/04/02/gitlab-17-10-3-released/), +[17.9.5](https://about.gitlab.com/releases/2025/04/02/gitlab-17-9-5-released/) ++ Gerrit Code Review [3.12.0-rc0](https://www.gerritcodereview.com/3.12.html#3120), +[3.12.0-rc1](https://www.gerritcodereview.com/3.12.html#3120), +[3.12.0-rc2](https://www.gerritcodereview.com/3.12.html#3120), +[3.12.0-rc3](https://www.gerritcodereview.com/3.12.html#3120), +[3.12.0-rc4](https://www.gerritcodereview.com/3.12.html#3120) ++ GitHub Desktop [3.4.19](https://desktop.github.com/release-notes/) ++ GitButler [0.14.19](https://github.com/gitbutlerapp/gitbutler/releases/tag/release/0.14.19), +[0.14.18](https://github.com/gitbutlerapp/gitbutler/releases/tag/release/0.14.18) ## Credits From e04bec710c80941755550b353700156419b11c6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Nar=C4=99bski?= Date: Tue, 29 Apr 2025 23:44:23 -0400 Subject: [PATCH 174/227] rn-122: Add links to news, articles, videos, and tools --- rev_news/drafts/edition-122.md | 93 +++++++++++++++++++++++++++++++++- 1 file changed, 91 insertions(+), 2 deletions(-) diff --git a/rev_news/drafts/edition-122.md b/rev_news/drafts/edition-122.md index eea3b8efb..c94c1259f 100644 --- a/rev_news/drafts/edition-122.md +++ b/rev_news/drafts/edition-122.md @@ -37,15 +37,104 @@ This edition covers what happened during the months of March 2025 and April 2025 __Various__ +* [Git turns 20: A Q&A with Linus Torvalds](https://github.blog/open-source/git/git-turns-20-a-qa-with-linus-torvalds/) + by Taylor Blau on GitHub blog. +* [Celebrating Git's 20th anniversary with creator Linus Torvalds](https://about.gitlab.com/blog/2025/04/07/celebrating-gits-20th-anniversary-with-creator-linus-torvalds/) + by Patrick Steinhardt on GitLab blog. +* [Linus Torvalds built Git in 10 days - and never imagined it would last 20 years](https://www.zdnet.com/article/linus-torvalds-built-git-in-10-days-and-never-imagined-it-would-last-20-years/) + by Steven Vaughan-Nichols on ZDNet. +* [20 years of Git. Still weird, still wonderful.](https://blog.gitbutler.com/20-years-of-git/) + by Scott Chacon on Butler's Log (GitButler). +* [Journey through Git's 20-year history](https://about.gitlab.com/blog/2025/04/14/journey-through-gits-20-year-history/) + by Patrick Steinhardt on GitLab blog. +* [GitHub MCP Server is now available in public preview](https://github.blog/changelog/2025-04-04-github-mcp-server-public-preview/) + [Model Context Protocol (MCP)](https://modelcontextprotocol.io/introduction) + is an AI tool calling standard that give LLMs (Large Language Models) + a standardized way to call functions, look up data, and interact with the world. + __Light reading__ - + +* [Two decades of Git: A conversation with creator Linus Torvalds](https://www.youtube.com/watch?v=sCr_gb8rdEI) + video interview (YouTube, 41:49). + __Git tools and sites__ +* [Devlands](https://devlands.com/) is the game that creates immersive experience + to help learning Git. Created by Jacob Stopak, the author of [Git-Sim](https://github.com/initialcommit-com/git-sim) + tool to visualize Git commands directly in your own repo, which was first mentioned + in [Git Rev News Edition #95](https://git.github.io/rev_news/2023/01/31/edition-95/). + Described in [I struggled with Git, so I'm making a game to spare others the pain](https://initialcommit.com/blog/im-making-a-git-game) + article on Initial Commit Blog. +* [Git Game Show](https://justinpaulson.github.io/git_game_show/) is a text interface app + that transforms your project's Git commit history into a live, multiplayer trivia game. + One user hosts a session, other players join remotely, and the system rotates + through rounds of different question-based "mini-games," awarding points + and declaring a final winner. +* [dgit](https://manpages.debian.org/testing/dgit/dgit.1.en.html) is a tool that + allows you to treat the Debian archive as if it were a git repository. + Conversely, it allows Debian to publish the source of its packages as git branches, + in a format which is directly useable by ordinary people. + * Note that GitHub's Spokes system that stores multiple distributed copies + of Git repositories was once called DGit. See [Stretching Spokes](https://github.blog/engineering/infrastructure/stretching-spokes/) + article by Michael Haggerty on GitHub Blog mentioned in + [Git Rev News Edition #14](https://git.github.io/rev_news/2016/04/20/edition-14/). +* [Mega](https://github.com/web3infra-foundation/mega) + is an unofficial open source implementation of Google Piper (a proprietary, massive, + centralized version control system that Google uses internally to manage their vast codebase). + It is a monorepo & monolithic codebase management system that supports Git. + More information can be found in [Why Google Stores Billions of Lines of Code in a Single Repository](https://cacm.acm.org/magazines/2016/7/204032-why-google-stores-billions-of-lines-of-code-in-a-single-repository/fulltext). + Written in Rust and TypeScript. +* [Oshiro's git](https://github.com/lucasoshiro/oshit): VCS written in Haskell + that tries to be compatible with git. This is not safe to use, + and is only meant for learning how git works and how hard it is. +* [codeowner-filter](https://kertal.github.io/codeowner-filter/) is a simple web tool + that solves the problem of finding just the files your team owns based + on the contents of [CODEOWNERS](https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners) file. + It will generate search filters for VSCode, scope configration for IDEA IDEs, and a list. +* [CodeOwners Filter](https://github.com/akowalska622/codeowners-filter) is a Visual Studio Code extension + that gives you a visual representation of the CODEOWNERS file + and helps you generate glob include patterns for any code owner. +* [rebuilderd](https://github.com/kpcyrd/rebuilderd) + is a tool that monitors the package repository + of a Linux distribution and uses rebuilder backends + like archlinux-repro to verify the provided binary packages + can be reproduced from the given source code. + Written in Rust, under GPL license. +* [reproduce](https://github.com/vltpkg/reproduce) is an open-source tool + designed to independently verify whether a published npm package + can be faithfully rebuilt from its declared source. + It is described in [Reproducibility vs. Provenance: Trusting the JavaScript Supply Chain](https://blog.vlt.sh/blog/reproducibility) + blog post by Darcy Clarke. +* [Graft](https://graft.rs/) is an open-source transactional storage engine + designed for efficient data synchronization at the edge. + It is described in [Stop syncing everything](https://sqlsync.dev/posts/stop-syncing-everything/) + article by Carl Sverre, his [Storing small things in big places](https://www.youtube.com/watch?v=eRsD8uSAi0s1) + Vancouver Systems Talk (video on YouTube, 55:04), and + [Building a serverless database replica with Carl Sverre](https://www.youtube.com/watch?v=dJurdmhPLH411) + High Performance SQLite Talk (video on YouTube, 1:10:19). + Written in Rust. + ## Releases From e4600200c299bb3087205b437d4c03987872c153 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 30 Apr 2025 08:19:58 +0200 Subject: [PATCH 175/227] rn-122: add article about Git's 20th anniversary --- rev_news/drafts/edition-122.md | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/rev_news/drafts/edition-122.md b/rev_news/drafts/edition-122.md index c94c1259f..06993f5e6 100644 --- a/rev_news/drafts/edition-122.md +++ b/rev_news/drafts/edition-122.md @@ -17,9 +17,18 @@ This edition covers what happened during the months of March 2025 and April 2025 ## Discussions - + +* [Let's celebrate Git's 20th anniversary this coming Monday!](https://lore.kernel.org/git/89757bec-4d7e-1d90-5697-44651c6128df@gmx.de/) + + Johannes Schindelin (alias Dscho) posted on the mailing list that + the oldest Git commit was performed on April 7th, 2005. So Monday + April 7th, 2025 was the 20th anniversary of Git! + + To celebrate this event, Dscho created + [a channel on Git's Discord, called `#20th-anniversary`](https://discord.gg/UcjvsNQR) + where everyone is welcome, especially to talk about their encounter + with Git. From 0a18c2cafd4e17cee43ca9594db26618da08af5a Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 30 Apr 2025 09:11:45 +0200 Subject: [PATCH 177/227] rn-122: mention the CFP close date --- rev_news/drafts/edition-122.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rev_news/drafts/edition-122.md b/rev_news/drafts/edition-122.md index 04fe590bd..a719bd82d 100644 --- a/rev_news/drafts/edition-122.md +++ b/rev_news/drafts/edition-122.md @@ -36,9 +36,9 @@ This edition covers what happened during the months of March 2025 and April 2025 conference on September 29-30 at GitHub HQ in San Francisco along with a Contributor's Summit on September 30. - Registration and a Call for Proposals are open. Requests for - financial assistance with travel costs can be sent to the Git PLC at - . + Registration and a Call for Proposals, which closes on May 13th, are + open. Requests for financial assistance with travel costs can be + sent to the Git PLC at . From 1a1236f4c06e0be79413d74efd71ee1576148f13 Mon Sep 17 00:00:00 2001 From: Markus Jansen Date: Thu, 1 May 2025 18:16:31 +0200 Subject: [PATCH 179/227] Supplied some tiny corrections and rephrasings. --- rev_news/drafts/edition-122.md | 43 +++++++++++++++++----------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/rev_news/drafts/edition-122.md b/rev_news/drafts/edition-122.md index 180fddca2..6ee380793 100644 --- a/rev_news/drafts/edition-122.md +++ b/rev_news/drafts/edition-122.md @@ -13,7 +13,7 @@ Welcome to the 122nd edition of [Git Rev News](https://git.github.io/rev_news/re a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to subscribe, see [the Git Rev News page](https://git.github.io/rev_news/rev_news/) on [git.github.io](http://git.github.io). -This edition covers what happened during the months of March 2025 and April 2025. +This edition covers what happened during the months of March and April 2025. ## Discussions @@ -42,7 +42,7 @@ This edition covers what happened during the months of March 2025 and April 2025 * [Patch (apply) vs. Pull](https://lore.kernel.org/git/1119284365.3926.15.camel@localhost.localdomain/) - To celebrate Git's 20th anniversary in our own way, let's talk about + To celebrate Git's 20th anniversary in our own way let's talk about a discussion on the Git mailing list that happened nearly 20 years ago. @@ -64,7 +64,7 @@ This edition covers what happened during the months of March 2025 and April 2025 based on a common history. Junio Hamano, who would later become the Git maintainer, then - replied to Darrin acknowledging that emailed patches are essentially + replied to Darrin acknowledging that emailed patches were essentially "out of band" communications. Merges could still work if the same patch had been applied independently. Even if that wasn't ideal, it was "manageable". @@ -88,7 +88,7 @@ This edition covers what happened during the months of March 2025 and April 2025 Daniel suggested integrating functionality similar to StGit into Git to help with applying patches and bridging the gap between the patch-based workflow and Git's commit-based model in general, even - though he thought that commits are "fundamentally resistant to + though he thought that commits were "fundamentally resistant to cherry-picking". Catalin over the course of the discussion provided specific details @@ -204,7 +204,7 @@ __Various__ by Scott Chacon on Butler's Log (GitButler). * [Journey through Git's 20-year history](https://about.gitlab.com/blog/2025/04/14/journey-through-gits-20-year-history/) by Patrick Steinhardt on GitLab blog. -* [GitHub MCP Server is now available in public preview](https://github.blog/changelog/2025-04-04-github-mcp-server-public-preview/) +* [GitHub MCP Server is now available in public preview](https://github.blog/changelog/2025-04-04-github-mcp-server-public-preview/). [Model Context Protocol (MCP)](https://modelcontextprotocol.io/introduction) is an AI tool calling standard that give LLMs (Large Language Models) a standardized way to call functions, look up data, and interact with the world. @@ -215,16 +215,17 @@ __Light reading__ * [Verifying tricky git rebases with git range-diff](https://andrewlock.net/verifiying-tricky-git-rebases-with-range-diffs/) by Andrew Lock on his .NET Escapades blog. * [Mirroring my git repositories](https://dustri.org/b/mirroring-my-git-repositories.html) - using [cgit](https://git.zx2c4.com/cgit/about/) for the interface, and nginx as a web server. + using [cgit](https://git.zx2c4.com/cgit/about/) for the interface and nginx as a web server. By Julien (jvoisin) Voisin on their7 blog. * [Mirroring my Repositories from GitHub to GitLab](https://cleberg.net/blog/git-mirror.html), - including both public and private repositories on GitLab Fre tier. + including both public and private repositories on GitLab Free tier. By Christian Cleberg on his blog. * [Documentation as Code with AsciiDoctor, GitLab CI, and GitLab Pages](https://jensknipper.de/blog/gitlab-ci-pages-asciidoc-documentation-as-code/) by Jens Knipper on his personal blog. * [Afraid to Git](https://dammit.nl/afraid-to-git.html): - a rant by Michiel Scholten about why because of misbehaving AI scrapers - he is not putting his Gitea instance (his Git server) on the Internet. + a rant by Michiel Scholten on his dammIT blog, explaining how misbehaving AI scrapers + cause him not to put his Gitea instance (his Git server) on the Internet, + and force others - like [Linux' kernel.org](https://git.kernel.org/) - to use tools like [Anubis](https://github.com/TecharoHQ/anubis). * [Fedora change aims for 99% package reproducibility](https://lwn.net/Articles/1014979/) by Joe Brockmeier on LWN\.net. @@ -238,7 +239,7 @@ __Easy watching__ __Git tools and sites__ * [Devlands](https://devlands.com/) is the game that creates immersive experience - to help learning Git. Created by Jacob Stopak, the author of [Git-Sim](https://github.com/initialcommit-com/git-sim) + to help learning Git. Created by Jacob Stopak, the author of the [Git-Sim](https://github.com/initialcommit-com/git-sim) tool to visualize Git commands directly in your own repo, which was first mentioned in [Git Rev News Edition #95](https://git.github.io/rev_news/2023/01/31/edition-95/). Described in [I struggled with Git, so I'm making a game to spare others the pain](https://initialcommit.com/blog/im-making-a-git-game) @@ -249,11 +250,11 @@ __Git tools and sites__ through rounds of different question-based "mini-games," awarding points and declaring a final winner. * [dgit](https://manpages.debian.org/testing/dgit/dgit.1.en.html) is a tool that - allows you to treat the Debian archive as if it were a git repository. - Conversely, it allows Debian to publish the source of its packages as git branches, + allows you to treat the Debian archive as if it was a Git repository. + Conversely, it allows Debian to publish the source of its packages as Git branches, in a format which is directly useable by ordinary people. * Note that GitHub's Spokes system that stores multiple distributed copies - of Git repositories was once called DGit. See [Stretching Spokes](https://github.blog/engineering/infrastructure/stretching-spokes/) + of Git repositories was once called DGit. See the [Stretching Spokes](https://github.blog/engineering/infrastructure/stretching-spokes/) article by Michael Haggerty on GitHub Blog mentioned in [Git Rev News Edition #14](https://git.github.io/rev_news/2016/04/20/edition-14/). * [Mega](https://github.com/web3infra-foundation/mega) @@ -262,13 +263,13 @@ __Git tools and sites__ It is a monorepo & monolithic codebase management system that supports Git. More information can be found in [Why Google Stores Billions of Lines of Code in a Single Repository](https://cacm.acm.org/magazines/2016/7/204032-why-google-stores-billions-of-lines-of-code-in-a-single-repository/fulltext). Written in Rust and TypeScript. -* [Oshiro's git](https://github.com/lucasoshiro/oshit): VCS written in Haskell - that tries to be compatible with git. This is not safe to use, - and is only meant for learning how git works and how hard it is. +* [Oshit aka Oshiro's git](https://github.com/lucasoshiro/oshit): VCS written in Haskell + that tries to be compatible with Git. This is not safe to use, + and is only meant for learning how Git works and how hard it is. * [codeowner-filter](https://kertal.github.io/codeowner-filter/) is a simple web tool that solves the problem of finding just the files your team owns based on the contents of [CODEOWNERS](https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners) file. - It will generate search filters for VSCode, scope configration for IDEA IDEs, and a list. + It will generate search filters for VSCode, scope configuration for IDEA IDEs, and a list. * [CodeOwners Filter](https://github.com/akowalska622/codeowners-filter) is a Visual Studio Code extension that gives you a visual representation of the CODEOWNERS file and helps you generate glob include patterns for any code owner. @@ -281,15 +282,15 @@ __Git tools and sites__ * [reproduce](https://github.com/vltpkg/reproduce) is an open-source tool designed to independently verify whether a published npm package can be faithfully rebuilt from its declared source. - It is described in [Reproducibility vs. Provenance: Trusting the JavaScript Supply Chain](https://blog.vlt.sh/blog/reproducibility) + It is described in the [Reproducibility vs. Provenance: Trusting the JavaScript Supply Chain](https://blog.vlt.sh/blog/reproducibility) blog post by Darcy Clarke. * [Graft](https://graft.rs/) is an open-source transactional storage engine designed for efficient data synchronization at the edge. - It is described in [Stop syncing everything](https://sqlsync.dev/posts/stop-syncing-everything/) + It is described in the [Stop syncing everything](https://sqlsync.dev/posts/stop-syncing-everything/) article by Carl Sverre, his [Storing small things in big places](https://www.youtube.com/watch?v=eRsD8uSAi0s1) - Vancouver Systems Talk (video on YouTube, 55:04), and + Vancouver Systems talk (video on YouTube, 55:04), and his [Building a serverless database replica with Carl Sverre](https://www.youtube.com/watch?v=dJurdmhPLH411) - High Performance SQLite Talk (video on YouTube, 1:10:19). + High Performance SQLite talk (video on YouTube, 1:10:19). Written in Rust. From 5a56a91f5af9d732ec1197777f7a3be343fe0942 Mon Sep 17 00:00:00 2001 From: Kaartic Sivaraam Date: Fri, 2 May 2025 00:00:02 +0530 Subject: [PATCH 180/227] rn-122: include anniversary q&a with Junio C Hamano This section is not complete yet. I am yet to expand it and add the community interview answers. --- rev_news/drafts/edition-122.md | 101 ++++++++++++++++++++++++++++++++- 1 file changed, 98 insertions(+), 3 deletions(-) diff --git a/rev_news/drafts/edition-122.md b/rev_news/drafts/edition-122.md index d3227faf4..830828d1c 100644 --- a/rev_news/drafts/edition-122.md +++ b/rev_news/drafts/edition-122.md @@ -186,9 +186,104 @@ This edition covers what happened during the months of March and April 2025. ### Support --> - +## Community interview + +_Editor note: For Git's 20th anniversary, we are doing an exclusive collaborative +community interview and curating answers from various community members. Also, +there's a short Q&A with our zealous, inclusive and tireless maintainer that +follows below._ + +TODO + +### Short Q&A with our maintainer, Junio C Hamano + +- **Looking back over ~20 years of maintaining Git, what has been the + most surprising or unexpected evolution in the project — technically + or community-wise?** + + Technically, one of the things I found surprising is how many lines + from Linus's original version still survive in today's codebase. The + [initial version of Git](https://github.com/git/git/commit/e83c5163316f89bfbde7d9ab23ca2e25604af290) + was 1244 lines spread across 11 files, which is miniscule compared + to 300+ thousands of lines in 4600+ files in v2.49.0, but it is not + fair to say Linus's original genius is less than 0.3% of what we have. + If you try running `git blame` in reverse, you'll see that about 10% + of lines we have in our tree came from the original version Linus + released 20 years ago. You can check out a + [little script called "Linus"](https://git.kernel.org/pub/scm/git/git.git/tree/Linus?h=todo) + out of my "todo" branch and run it to see for yourself. + + Community-wise, there weren't many things that surprised me. I + expected a bit more developers who are interested in the core part of + system to stick around, say for more than 10 years, and I hoped that + some of them would be from younger generations who have never seen any + version control system other than Git, but how many among the active + contributors we see on the list every week fall into that category? We + have long-timers who are respected in the community, but we want to + grow that pool by say 5 every year or so, some of them ready to stick + around for another 10 years. In [a recent interview](https://github.blog/open-source/git/git-turns-20-a-qa-with-linus-torvalds/), + Linus said he wanted somebody with good taste who sticks around, and + I do believe it is essential to have a sufficient number of long-timers + who can guide new folks into the community. + + So that is a bit of surprise that makes me a little sad, but at the + same time, I think what is happening is that a development community + of an extremely popular and successful system that is mature with + friendly atmosphere has attracted many aspiring new folks, they + scratch their own itches and have fun, but then they find more + interesting things to do and go back to be happy end-users, which is + totally expected and natural thing. + +- **What are your thoughts about AI-assisted development tools in the + context of Git? Do you see a place for Git itself to become more + "intelligent"?** + + I've kept saying that + + is one of the most important design discussion in the early days of + Git. In that article, Linus outlines how his "ideal" SCM tool would + let you follow the historyz of a single function in today's codebase + backwards, notice that at certain revision the function appeared, but + the tool finds five functions disappeared in the same revision, all + looking very similar to the function we are interested in that was + added there, and the tool can explain that the commit consolidated + duplicated reimplementations done in various subdirectories into a + single common function and adjusted the existing callers of them to + the SCM user (if you want to learn more details, go to the original + and read it twice, I'll wait). + + We can do `git log -S` repeatedly to drill + down the history to find the revision that introduced that new + (possibly consolidated) function. In fact, the `-S` feature + was invented exactly for the purpose of serving as the first step of + Linus's "ideal" SCM tool described in the article. But "finding + similar existing (and possibly getting lost) code in the same or + possibly nearby revisions" have been nebulous. I do not think anybody + in the Git circle tried it yet. I wonder, after 20 years, perhaps we + can feed a project's codebase to LLMs and let them figure out such a + fact? + +- **What's your boldest prediction about how version control might look in + another 20 years?** + + I do not even foresee what software development in 20 years would look + like. I am not an insight kind of person. + +- **What advice would you give to someone who might one day step into your + role as Git maintainer?** + + Be original. I didn't aim to duplicate the style Linus ran his tree + during the first four months of the project. My successor does not + have to duplicate my style of running the project, either. Having said + that, personally I would like to see more distribution of + responsibility. The maintainer may play a role of the final arbiter, + but it would be great if we can come up with a mechanism to allow list + participants to bear more of the burden of picking and choosing good + direction to go, deciding if a particular change is worth doing or the + are better ways to do the same thing, etc. I've been trying to nudge + the list discussions in that direction for the past few years, but + without much success, I think. + ## Other News From 0f012acfb174c70d2f4e08400e4c31f7c9e9b54a Mon Sep 17 00:00:00 2001 From: Kaartic Sivaraam Date: Fri, 2 May 2025 10:46:23 +0530 Subject: [PATCH 181/227] rn-122: include answers from various community members --- rev_news/drafts/edition-122.md | 340 ++++++++++++++++++++++++++++++++- 1 file changed, 336 insertions(+), 4 deletions(-) diff --git a/rev_news/drafts/edition-122.md b/rev_news/drafts/edition-122.md index 830828d1c..a82d1592f 100644 --- a/rev_news/drafts/edition-122.md +++ b/rev_news/drafts/edition-122.md @@ -189,11 +189,343 @@ This edition covers what happened during the months of March and April 2025. ## Community interview _Editor note: For Git's 20th anniversary, we are doing an exclusive collaborative -community interview and curating answers from various community members. Also, -there's a short Q&A with our zealous, inclusive and tireless maintainer that -follows below._ +community interview and curating answers of various community members. Also, +there's a [short Q&A](#short-qa-with-our-maintainer-junio-c-hamano) with our +zealous, inclusive and tireless maintainer that follows below._ + + +- **What's your favorite Git trick or workflow that you wish more people + knew about?** + + [_Thalia Rose_][thalia]: For rebase-heavy workflows, `git range-diff` is incredibly + useful. To compare against upstream, use `git range-diff @{u}...@`, + and to compare against the previous HEAD, use `git range-diff @{1}...@`. + + [_Lucas Seiki Oshiro_][seiki]: Everything related to code archaeology + (`git grep`, `git log -S/-G`, `git log -L` and `git bisect`). Those are + my primary debugging tools and every time I explained them to other + people they find them mind-blowing and useful. + And they also started loving it :-) + + [_Elijah Newren_][elijah]: [`range-diff`][range-diff]. The ideas behind + it ought to be the basis for code review, IMO. Commits should be the + unit of review (including commit messages as a fundamental and primary + thing to be reviewed), and a series of commits should be the unit of + merging. I dislike most code review tools, because they get one or + both of those things wrong. Getting both of those things right naturally + leads to `range-diff` or something like it being a very important part + of the workflow, at a minimum for detecting which commits in a series + are unmodified and which have been updated and need to be further reviewed. + + +- **What was your worst Git disaster, and how did you recover from it?** + + [_Thalia Rose_][thalia]: When I was first starting with Git, I wanted to make a repo + to preserve my first coding project when I was twelve, a bunch of VBS scripts. + I had assumed that Git maintained file modification timestamps, so I deleted + the originals because they were now redundant. I now no longer know exactly + when I wrote them and have been careful about timestamps ever since. + + [_Luca Milanesio_][luca]: I suspect to be one of the worst offenders :-) [ [ref](https://www.infoq.com/news/2013/11/use-the-force) ] + + Thankfully I was using Gerrit Code Review and the replication plugin: + the refs were not lost but just rewind and we could reset all the + correct SHA1s for all of them. + + [_Lucas Seiki Oshiro_][seiki]: I don't remember something that I did, + but I remember a simple and curious disaster: our deploy workflows + stopped working, only leaving a message like "cannot fetch + ambiguous reference `master`". I decided to investigate what happened + and I found out that someone by mistake (I don't know how) created a + tag called `master` and pushed it to GitHub. By the time we used the + `master` branch for deploy, and the workflows didn't know if they + should use the `master` branch or tag. GitHub didn't have a feature + for deleting tags through the web interface, so we thought + "what should we do?". + + The solution was to run `git push origin :refs/tags/master`. Simple, + but not obvious. A classic case where it only required a screw to be + turned, but all the hard work was to find which screw should be turned. + + [_Elijah Newren_][elijah]: + My worst Git-related disaster wasn't with Git directly but with our + Git hosting software we used at a prior job, Gerrit. 'twas a + "startup" that was still forming good practices. We had both a + production and a staging instance. The staging instance was seeded + with a copy of production data so we could do scale testing...but that + seeding process was a multi-step manual thing; it hadn't been + automated. One step was, as best I recall, "drop database gerrit", + followed by loading the production copy of the mysql database (this + was long before [NoteDB][notedb] arrived). And as many readers + probably have guessed by now, I was on the wrong host one day when + I ran that command. + + The actual git repositories were still intact, but the review metadata + was toast. Luckily, we had a backup from about 7 hours earlier, so we + could recover the older review metadata and with some hackery fix the + mysql metadata mismatch with the newer repository contents. And since + Gerrit emailed folks comments from reviews as they were posted, we + could tell people to look at their emails for the pieces we couldn't + recover. + + It was a really long night trying to fix things. Some folks told me + they thought I was going to throw up just looking at me. But I + learned how wonderful it was to be at a company with blameless + post-mortems, and I appreciated the many folks who reached out to tell + me stories of mistakes they had made. They were more interested in + whether we learned our lesson and put processes into place to prevent + repeats, and I definitely did both. + + I did, of course, also get some good-natured ribbing, such as people + saying I got to play the part of little Bobby Tables once (see + [this xkcd comic][bobby-tables] if you don't know that reference). + I kindly reminded them that I didn't drop a table -- I dropped the whole + database (plus, it wasn't injection, it was just running a command in + the wrong location). Also, one of my colleagues helpfully modified + the prompt on production to be red and bold, "This is PROD Gerrit", + and the prompt on staging to be green, "This is staging Gerrit; it's + okay to drop database here!" The prompts ended up not mattering since + I automated the process, and made sure the process just error'ed out + if run on prod instead of staging. But the prompt persisted for many + years anyway, because I thought it was a hilarious way to poke fun at + my blunder. + + +- **If you could go back in time and change one design decision in Git, + what would it be?** + + [_Luca Milanesio_][luca]: Use SHA-256 straight away, as it was + published 24 years ago and already existed at the time Git was designed. + + [_Lucas Seiki Oshiro_][seiki]: Perhaps writing a more abstract CLI. After + studying Git a little more deeper it makes sense for me, but I would group + the functionality into more high-level subcommands and would make the flags + and options more consistent across the subcommands. + + For example, Docker CLI have all the image operations under + `docker image` and all the network operations under `docker network`. + If I want to delete an image, I use `docker image rm`, if I want to + delete a network, I use `docker network rm`, and so on. I would make + Git CLI work based on that idea, for example: + + - `git branch add my_branch` + - `git branch delete my_branch` + - `git branch list` + - `git remote add my_remote ...` + - `git remote delete my_remote` + - `git remote list` + - `git tag add my_tag` + - `git tag delete my_tag` + - `git tag list` + + With some shorter alias, just like Docker has `docker rmi` and + `docker rm`. + + [_Elijah Newren_][elijah]: The index. For a few reasons. + + 1. Performance. + 1. The index is pervasive throughout the codebase, and while it works + great for small repositories, it means that many operations are O(size + of repository) instead of O(size of changes). [sparse indices][sparse-index] + help, but the code has to be carefully audited for sparse indices to + work with each codepath, and even then there tends to be a fallback of + just-load-everything-anyway because the data structure doesn't lend + nicely to just expanding a little more. + + 2. An under-appreciated aspect of the performance improvements that + came from our new merge strategy, [`merge-ort`][merge-ort], were due + to dispensing with the index as the primary data structure. The index + had two problems: + 1. first of all it meant loading every path in the repository, + which would have prevented ort's optimization to avoid recursing into + subtrees when unnecessary (an optimization that often made merges e.g. + 50x faster). Sparse indices didn't exist back then, but even if they + had we would have had to complicate them significantly in order to + have their sparseness be determined by renames and the intersection of + modified paths on the two sides of history instead of having + sparseness determined by user-defined path rules; I think that'd have + been much more complicated than just dispensing with the index as the + data structure, but we didn't even have sparse indices back then + anyway. + + 2. Second, the use of the index as done in the old merge strategy, + `merge-recursive`, resulted in O(N^2) behavior since entries (including + conflicted higher order stages) had to be inserted in sorted order. + Deleting entries didn't have the same O(N^2) problem due to some + tricks to queue the deletion for later, but attempting to do the same + for insertions was far from straightforward and I believe would have + required making some other data structure primary and then forming the + index at the end. (Note that the primary data structure used, whatever + it is, cannot just have a list of things to insert, it also needs to + be checked for various properties intermingled with insertions...and + those sometimes relied on the fact that the index was sorted for quick + lookups.)

+ (Note that a tree-structured index rather than a linear index would + resolve these problems. But retrofitting the entire codebase is + probably never going to happen...) + + 2. Cognitive Complexity.
The funny thing is, although I say this, + I use the index all the time. I use `git add -p` a lot. I very much + need to slice and dice my changes into different commits, and tend to + have dirty changes that I don't want pushed.

+ But slicing and dicing before things are committed, as opposed to + being able to slice and dice after, is a choice that adds a lot of + complexity to the user interface and does so even for users who aren't + interested in slicing and dicing commits. We don't have a + sufficiently flexible set of tooling for slicing and dicing commits + after-the-fact within git to switch to a post-commit-slice-and-dice + workflow even today, but I suspect that some of the ideas from [JJ][jujutsu] + would or could be much better than the methods I use today in git to + slice and dice commits. + + +- **Which Git feature or improvement over the past 20 years do you think + had the biggest impact on your workflow?** + + [_Lucas Seiki Oshiro_][seiki]: Sorry, but I can't answer. I am from a + generation that started programming when Git was already the de facto + VCS so I can't compare a world that has it with a world that doesn't have. + + [_Elijah Newren_][elijah]: Speed. + + Being able to instantly switch branches (in smaller repos, sure, but + CVS and SVN couldn't pull it off even in small repos) was a game + changer. + + +- **What Git problem that existed 10 years ago has been most + successfully solved?** + + [_Lucas Seiki Oshiro_][seiki]: Sorry again, but 10 years ago I was only + starting to use Git and when I started to use more complex features they + already were there. + + [_Elijah Newren_][elijah]: Merging and rebasing with lots of renames + (and generally merging without a worktree or index). I'm obviously + a bit biased on this point, but that doesn't mean I'm wrong. ;-) + It used to be awful and works great now. + + Relatedly, merging without a worktree or index was problematic; you + had to either use an alternative merge strategy with limited + capabilities, or use something other than git (e.g. [libgit2][libgit2]). + But now git handles it well with its default merge strategy. + + +- **Which Git commands or workflows do you think are still misunderstood + or underutilized today?** + + [_Lucas Seiki Oshiro_][seiki]: I think [squash merges][squash-merge] and + [submodules][submodule] are really misunderstood, yet they are the opposite + of being underutilized. Sadly I saw several people using them in daily basis, + based on the wrong idea of what they are and then using them incorrectly. + + + What I think it is underutilized is the full power of commits of being + a good source of documentation and good resource for, again, performing + code archaeology that may help understanding what the code does and + debugging it. Several developers treat the commits as just checkpoints. + + [_Elijah Newren_][elijah]: `range-diff` is very under-utilized, but I + already discussed that above. + + +- **What's one Git based project, tool, or extension you think deserves + more recognition from the community?** + + [_Lucas Seiki Oshiro_][seiki]: Perhaps it would be better to leave this + question for other less known tools. But if you want an answer, I think: + + - [Delta](https://github.com/dandavison/delta) is a really cool to + format the diff-related outputs; + + - [Kworkflow](https://kworkflow.org/) is a powerful tool for + contributing to the Linux kernel source code (I should also + try it for contributing to the Git source code); + + - Merge drivers in general. `diff3` works in most cases but it is + only based on pure diffs, without performing deeper operations based + on the file format they are merging. + + +- **What Git feature or capability surprised you most when you first + discovered it?** + + [_Lucas Seiki Oshiro_][seiki]: As you may have noticed, I'm really + a fan of Git archaeology :-), so I would say all that I mentioned + in the first answer (i.e., `git grep`, `git log -S/-G`, `git log -L` + and `git bisect`). But my favorite is still [bisect][bisect]. + It's an egg of Columbus and everyone that I have shown it to + was equally amazed by it! + + +- **What's your boldest prediction about how version control might look + in another 20 years?** + + [_Lucas Seiki Oshiro_][seiki]: I still see Git as the dominant VCS + in the future, but I think more Git-based VCSs (like [Jujutsu][jujutsu] + will arise. Just like we have today programming languages built on top + of the stack of the other languages (e.g. Clojure, Kotlin and Scala on + JVM, TypeScript on JS), networking protocols written on top of other + protocols (e.g. QUIC on UDP, gRPC on HTTP) and so on. + + The Git core is simple, flexible, transparent and powerful and there's + still room for people using it directly in several creative ways. Once + I saw [a project using it as a backend for a NoSQL database][git-backend-nosql], + who knows how many use cases we still have for it. + + [_Elijah Newren_][elijah]: I'm more interested in what storms might be + brewing along that path, and what we might be able to do to avoid them. + In particular, some questions and observations in that area: + + * With monorepos growing ever larger, do we have hard-to-workaround-or-fix + design decisions that pose scaling challenges? e.g. + * the index data structure + * per-directory .gitignore files, per-directory .gitattribute files, etc. + * ...or do the prominent Git forges have hard-to-workaround-or-fix + design decisions that'll give Git a reputation for not scaling? e.g. + * making refs/pull/NNN/merge a public ref and excessively + implicitly updating it + * Will we face a crisis of interest? e.g. + * `git` is currently written in C. Even if that's not a liability + already, coupled with "decades" I think it is. Young developers + probably don't want to learn C, and older ones who already know C + may worry about C becoming a Fortran or Cobol. + * Companies employing Git developers think "git already won" and + redeploy those engineers on other problems + * Will the combination of issues above result in folks who want improvements + deciding their best bet is not improving Git but in creating/funding + an alternative? Will that snowball? + +
+ To me, the entry of new projects like [JJ][jujutsu] and [sapling][sapling] + suggest the above are real concerns already rather than just theoretical. + Both projects have compelling things that git lacks. I like the friendly + competition, and the JJ and sapling developers are awesome to talk to + at Git Merge conferences. But there is a risk that this friendly + competition mirrors that of Git and Mercurial from years past, and + that Git at some future point down the road ends up on the other side + of that history and gets largely displaced by the alternatives. I'd + rather not see that happen, but I sometimes wonder if we're taking + enough measures to avoid marching towards such an outcome. + + +[thalia]: https://discord.com/channels/1042895022950994071/1361310935427584213/1361316878819131452 +[luca]: https://public-inbox.org/git/04A328E9-1146-4D4A-84E7-456FFEB66A5A@gmail.com/ +[seiki]: https://public-inbox.org/git/AE27429C-97B1-4226-8F30-5B635A050498@gmail.com/ +[elijah]: https://public-inbox.org/git/CABPp-BH2yH4iJ28Bo7Q=uryu68LLk7a0Tvb2SzAbAiHK8QpRug@mail.gmail.com/ +[squash-merge]: https://git-scm.com/docs/git-merge#Documentation/git-merge.txt---squash +[submodule]: https://git-scm.com/docs/git-submodule +[bisect]: https://git-scm.com/docs/git-bisect +[range-diff]: https://git-scm.com/docs/git-range-diff +[sparse-index]: https://git-scm.com/docs/sparse-index +[merge-ort]: https://git-scm.com/docs/merge-strategies#Documentation/merge-strategies.txt-ort +[jujutsu]: https://github.com/jj-vcs/jj?tab=readme-ov-file#introduction +[git-backend-nosql]: https://www.kenneth-truyers.net/2016/10/13/git-nosql-database +[notedb]: https://www.gerritcodereview.com/notedb.html +[bobby-tables]: https://xkcd.com/327/ +[libgit2]: https://libgit2.org/ +[sapling]: https://sapling-scm.com/ -TODO ### Short Q&A with our maintainer, Junio C Hamano From a490ab658f8a2a5a40d45e26f841939a48a2c399 Mon Sep 17 00:00:00 2001 From: Kaartic Sivaraam Date: Fri, 2 May 2025 10:46:32 +0530 Subject: [PATCH 182/227] rn-122: minor grammatical and typo corrections to Junio's answers --- rev_news/drafts/edition-122.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rev_news/drafts/edition-122.md b/rev_news/drafts/edition-122.md index a82d1592f..91ce4a025 100644 --- a/rev_news/drafts/edition-122.md +++ b/rev_news/drafts/edition-122.md @@ -574,7 +574,7 @@ zealous, inclusive and tireless maintainer that follows below._ is one of the most important design discussion in the early days of Git. In that article, Linus outlines how his "ideal" SCM tool would - let you follow the historyz of a single function in today's codebase + let you follow the history of a single function in today's codebase backwards, notice that at certain revision the function appeared, but the tool finds five functions disappeared in the same revision, all looking very similar to the function we are interested in that was @@ -611,10 +611,10 @@ zealous, inclusive and tireless maintainer that follows below._ responsibility. The maintainer may play a role of the final arbiter, but it would be great if we can come up with a mechanism to allow list participants to bear more of the burden of picking and choosing good - direction to go, deciding if a particular change is worth doing or the - are better ways to do the same thing, etc. I've been trying to nudge - the list discussions in that direction for the past few years, but - without much success, I think. + direction to go, deciding if a particular change is worth doing or + are there better ways to do the same thing, etc. I've been trying to + nudge the list discussions in that direction for the past few years, + but without much success, I think. ## Other News From 6fb1b49b3c6b24ab1430a6e40123f9846d1eb2fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20N=C4=9Bmec?= Date: Fri, 2 May 2025 10:05:20 +0200 Subject: [PATCH 183/227] rn-122: minor copy edit --- rev_news/drafts/edition-122.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/rev_news/drafts/edition-122.md b/rev_news/drafts/edition-122.md index 91ce4a025..65ea3c4de 100644 --- a/rev_news/drafts/edition-122.md +++ b/rev_news/drafts/edition-122.md @@ -79,7 +79,7 @@ This edition covers what happened during the months of March and April 2025. as a series of commits, and wondered if that would still allow cherry-picking patches. - Then Daniel Barkalow and Catalin Marinas chimed into the discussion + Then Daniel Barkalow and Catalin Marinas chimed in to talk about [StGit (Stacked Git)](https://stacked-git.github.io/) which helps manage Git commits as a stack of patches. Catalin Marinas was the creator of StGit, which seems to still be developed @@ -154,7 +154,7 @@ This edition covers what happened during the months of March and April 2025. Daniel and Linus continued to discuss practical ways to identify and manage patches across repositories. Linus proposed hashing the - actual changes in a patch, ignoring line numbers and whitespaces, + actual changes in a patch, ignoring line numbers and whitespace, rather than relying on explicit IDs or commit metadata. He implemented this idea in the form of a `git-patch-id` and tested it on the Linux kernel repository where it found 15 duplicate patches @@ -420,7 +420,7 @@ zealous, inclusive and tireless maintainer that follows below._ based on the wrong idea of what they are and then using them incorrectly. - What I think it is underutilized is the full power of commits of being + What I think is underutilized is the full power of commits being a good source of documentation and good resource for, again, performing code archaeology that may help understanding what the code does and debugging it. Several developers treat the commits as just checkpoints. @@ -435,8 +435,8 @@ zealous, inclusive and tireless maintainer that follows below._ [_Lucas Seiki Oshiro_][seiki]: Perhaps it would be better to leave this question for other less known tools. But if you want an answer, I think: - - [Delta](https://github.com/dandavison/delta) is a really cool to - format the diff-related outputs; + - [Delta](https://github.com/dandavison/delta) is a really cool tool + for formatting the diff-related outputs; - [Kworkflow](https://kworkflow.org/) is a powerful tool for contributing to the Linux kernel source code (I should also @@ -633,7 +633,7 @@ __Various__ by Patrick Steinhardt on GitLab blog. * [GitHub MCP Server is now available in public preview](https://github.blog/changelog/2025-04-04-github-mcp-server-public-preview/). [Model Context Protocol (MCP)](https://modelcontextprotocol.io/introduction) - is an AI tool calling standard that give LLMs (Large Language Models) + is an AI tool calling standard that gives LLMs (Large Language Models) a standardized way to call functions, look up data, and interact with the world. @@ -643,7 +643,7 @@ __Light reading__ by Andrew Lock on his .NET Escapades blog. * [Mirroring my git repositories](https://dustri.org/b/mirroring-my-git-repositories.html) using [cgit](https://git.zx2c4.com/cgit/about/) for the interface and nginx as a web server. - By Julien (jvoisin) Voisin on their7 blog. + By Julien (jvoisin) Voisin on their blog. * [Mirroring my Repositories from GitHub to GitLab](https://cleberg.net/blog/git-mirror.html), including both public and private repositories on GitLab Free tier. By Christian Cleberg on his blog. From aa8780558a57262be2838bf6f80c4ec2a174b12c Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 2 May 2025 10:30:05 +0200 Subject: [PATCH 184/227] =?UTF-8?q?rn-122:=20add=20=C5=A0t=C4=9Bp=C3=A1n?= =?UTF-8?q?=20N=C4=9Bmec=20among=20the=20helpers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rev_news/drafts/edition-122.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-122.md b/rev_news/drafts/edition-122.md index 65ea3c4de..e0fc726a4 100644 --- a/rev_news/drafts/edition-122.md +++ b/rev_news/drafts/edition-122.md @@ -751,4 +751,4 @@ Christian Couder <>, Jakub Narębski <>, Markus Jansen <> and Kaartic Sivaraam <> -with help from Bruno Brito. +with help from Bruno Brito and Štěpán Němec. From 55354769a184da9de585159393ca96ee0ac3a674 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 2 May 2025 10:31:09 +0200 Subject: [PATCH 185/227] rn-122: add Junio Hamano among the helpers --- rev_news/drafts/edition-122.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-122.md b/rev_news/drafts/edition-122.md index e0fc726a4..07dd1419e 100644 --- a/rev_news/drafts/edition-122.md +++ b/rev_news/drafts/edition-122.md @@ -751,4 +751,4 @@ Christian Couder <>, Jakub Narębski <>, Markus Jansen <> and Kaartic Sivaraam <> -with help from Bruno Brito and Štěpán Němec. +with help from Junio Hamano, Bruno Brito and Štěpán Němec. From 3018e6467e34203a575b81037af1374ece4f8c6e Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 2 May 2025 10:32:56 +0200 Subject: [PATCH 186/227] rn-122: add Lucas Seiki Oshiro among the helpers --- rev_news/drafts/edition-122.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-122.md b/rev_news/drafts/edition-122.md index 07dd1419e..17f0183ae 100644 --- a/rev_news/drafts/edition-122.md +++ b/rev_news/drafts/edition-122.md @@ -751,4 +751,5 @@ Christian Couder <>, Jakub Narębski <>, Markus Jansen <> and Kaartic Sivaraam <> -with help from Junio Hamano, Bruno Brito and Štěpán Němec. +with help from Junio Hamano, Lucas Seiki Oshiro, +Bruno Brito and Štěpán Němec. From d65603d5d248a2c261d94e53fd67a692b058cc1a Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 2 May 2025 10:33:59 +0200 Subject: [PATCH 187/227] rn-122: add Elijah Newren among the helpers --- rev_news/drafts/edition-122.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-122.md b/rev_news/drafts/edition-122.md index 17f0183ae..c5ff524a0 100644 --- a/rev_news/drafts/edition-122.md +++ b/rev_news/drafts/edition-122.md @@ -752,4 +752,4 @@ Jakub Narębski <>, Markus Jansen <> and Kaartic Sivaraam <> with help from Junio Hamano, Lucas Seiki Oshiro, -Bruno Brito and Štěpán Němec. +Elijah Newren, Bruno Brito and Štěpán Němec. From e073b23d5b1e88cb9162bb7fc8a009e1974cb523 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 2 May 2025 10:35:16 +0200 Subject: [PATCH 188/227] rn-122: add Thalia Rose among the helpers --- rev_news/drafts/edition-122.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-122.md b/rev_news/drafts/edition-122.md index c5ff524a0..9b211c51d 100644 --- a/rev_news/drafts/edition-122.md +++ b/rev_news/drafts/edition-122.md @@ -752,4 +752,4 @@ Jakub Narębski <>, Markus Jansen <> and Kaartic Sivaraam <> with help from Junio Hamano, Lucas Seiki Oshiro, -Elijah Newren, Bruno Brito and Štěpán Němec. +Thalia Rose, Elijah Newren, Bruno Brito and Štěpán Němec. From 5dc96627086a63d04aefe0b7a13cd1f15949ed88 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 2 May 2025 10:36:31 +0200 Subject: [PATCH 189/227] rn-122: add Luca Milanesio among the helpers --- rev_news/drafts/edition-122.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-122.md b/rev_news/drafts/edition-122.md index 9b211c51d..437ee8960 100644 --- a/rev_news/drafts/edition-122.md +++ b/rev_news/drafts/edition-122.md @@ -752,4 +752,5 @@ Jakub Narębski <>, Markus Jansen <> and Kaartic Sivaraam <> with help from Junio Hamano, Lucas Seiki Oshiro, -Thalia Rose, Elijah Newren, Bruno Brito and Štěpán Němec. +Luca Milanesio, Thalia Rose, Elijah Newren, +Bruno Brito and Štěpán Němec. From 47c4e9768232694ee7f6b7e2bb282c4471f9082f Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 2 May 2025 10:38:44 +0200 Subject: [PATCH 190/227] rn-122: add Toon Claes among the helpers --- rev_news/drafts/edition-122.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-122.md b/rev_news/drafts/edition-122.md index 437ee8960..8b5803aab 100644 --- a/rev_news/drafts/edition-122.md +++ b/rev_news/drafts/edition-122.md @@ -753,4 +753,4 @@ Markus Jansen <> and Kaartic Sivaraam <> with help from Junio Hamano, Lucas Seiki Oshiro, Luca Milanesio, Thalia Rose, Elijah Newren, -Bruno Brito and Štěpán Němec. +Toon Claes, Bruno Brito and Štěpán Němec. From 6f8f2da4b4903a0a91329ce2f6e0760e79a98f59 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 2 May 2025 10:39:47 +0200 Subject: [PATCH 191/227] rn-122: add Lee Reilly among the helpers --- rev_news/drafts/edition-122.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-122.md b/rev_news/drafts/edition-122.md index 8b5803aab..98ace1084 100644 --- a/rev_news/drafts/edition-122.md +++ b/rev_news/drafts/edition-122.md @@ -753,4 +753,4 @@ Markus Jansen <> and Kaartic Sivaraam <> with help from Junio Hamano, Lucas Seiki Oshiro, Luca Milanesio, Thalia Rose, Elijah Newren, -Toon Claes, Bruno Brito and Štěpán Němec. +Toon Claes, Lee Reilly, Bruno Brito and Štěpán Němec. From a08a01d87eed82f1f890c0c33b7647eef5adb655 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 2 May 2025 10:42:51 +0200 Subject: [PATCH 192/227] Publish rn-122 in _posts/ --- .../edition-122.md => _posts/2025-04-30-edition-122.markdown | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename rev_news/drafts/edition-122.md => _posts/2025-04-30-edition-122.markdown (100%) diff --git a/rev_news/drafts/edition-122.md b/_posts/2025-04-30-edition-122.markdown similarity index 100% rename from rev_news/drafts/edition-122.md rename to _posts/2025-04-30-edition-122.markdown From 6f696bd5a1d59af76c783727c1ee7323a89db0c5 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 2 May 2025 10:42:51 +0200 Subject: [PATCH 193/227] Add draft for rn-123 --- rev_news/drafts/edition-123.md | 60 ++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 rev_news/drafts/edition-123.md diff --git a/rev_news/drafts/edition-123.md b/rev_news/drafts/edition-123.md new file mode 100644 index 000000000..ee42dedcd --- /dev/null +++ b/rev_news/drafts/edition-123.md @@ -0,0 +1,60 @@ +--- +title: Git Rev News Edition 123 (May 31st, 2025) +layout: default +date: 2025-05-31 12:06:51 +0100 +author: chriscool +categories: [news] +navbar: false +--- + +## Git Rev News: Edition 123 (May 31st, 2025) + +Welcome to the 123rd edition of [Git Rev News](https://git.github.io/rev_news/rev_news/), +a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to +subscribe, see [the Git Rev News page](https://git.github.io/rev_news/rev_news/) on [git.github.io](http://git.github.io). + +This edition covers what happened during the months of April 2025 and May 2025. + +## Discussions + + + + + + + + + +## Other News + +__Various__ + + +__Light reading__ + + + +__Git tools and sites__ + + +## Releases + + +## Credits + +This edition of Git Rev News was curated by +Christian Couder <>, +Jakub Narębski <>, +Markus Jansen <> and +Kaartic Sivaraam <> +with help from XXX. From 777f3f400de00a17ce6811d3ac7f07c6eb6e121e Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 30 May 2025 09:40:53 +0200 Subject: [PATCH 194/227] rn-123: add releases --- rev_news/drafts/edition-123.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/rev_news/drafts/edition-123.md b/rev_news/drafts/edition-123.md index ee42dedcd..5d3b52824 100644 --- a/rev_news/drafts/edition-123.md +++ b/rev_news/drafts/edition-123.md @@ -49,6 +49,30 @@ __Git tools and sites__ ## Releases ++ Git [2.50.0-rc0](https://public-inbox.org/git/xmqqzfewsml1.fsf@gitster.g/) ++ GitLab [18.0.1, 17.11.3, 17.10.7](https://about.gitlab.com/releases/2025/05/21/patch-release-gitlab-18-0-1-released/), +[18.0](https://about.gitlab.com/releases/2025/05/15/gitlab-18-0-released/), +[17.11.2, 17.10.6, 17.9.8](https://about.gitlab.com/releases/2025/05/07/patch-release-gitlab-17-11-2-released/) ++ Gerrit Code Review [3.10.6](https://www.gerritcodereview.com/3.10.html#3106), +[3.11.3](https://www.gerritcodereview.com/3.11.html#3113), +[3.12.0-rc5](https://www.gerritcodereview.com/3.12.html#3120), +[3.12.0-rc6](https://www.gerritcodereview.com/3.12.html#3120), +[3.12.0](https://www.gerritcodereview.com/3.12.html#3120), +[3.9.11](https://www.gerritcodereview.com/3.9.html#3911) ++ GitHub Enterprise [3.16.3](https://docs.github.com/enterprise-server@3.16/admin/release-notes#3.16.3), +[3.15.7](https://docs.github.com/enterprise-server@3.15/admin/release-notes#3.15.7), +[3.14.12](https://docs.github.com/enterprise-server@3.14/admin/release-notes#3.14.12), +[3.13.15](https://docs.github.com/enterprise-server@3.13/admin/release-notes#3.13.15), +[3.17.0](https://docs.github.com/enterprise-server@3.17/admin/release-notes#3.17.0) ++ GitKraken [11.1.1](https://help.gitkraken.com/gitkraken-client/current/), +[11.1.0](https://help.gitkraken.com/gitkraken-client/current/), +[11.0.0](https://help.gitkraken.com/gitkraken-client/current/) ++ GitHub Desktop [3.4.20](https://desktop.github.com/release-notes/) ++ Garden [2.2.0](https://github.com/garden-rs/garden/releases/tag/v2.2.0) ++ Git Cola [4.13.0](https://github.com/git-cola/git-cola/releases/tag/v4.13.0) ++ GitButler [0.14.26](https://github.com/gitbutlerapp/gitbutler/releases/tag/release/0.14.26), +[0.14.25](https://github.com/gitbutlerapp/gitbutler/releases/tag/release/0.14.25) ++ git-credential-oauth [0.15.1](https://github.com/hickford/git-credential-oauth/releases/tag/v0.15.1) ## Credits From af1b66d6cd95530d44c4b3a1f5825ed7d28caf8e Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Fri, 30 May 2025 10:09:46 +0200 Subject: [PATCH 195/227] microprojects: drop project to fix sign comparison warnings As it turns out, fixing sign comparison warnings is very intricate in a lot of situations and has led to frustration on both the contributor's and reviewer's side. Drop the project. --- SoC-2025-Microprojects.md | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/SoC-2025-Microprojects.md b/SoC-2025-Microprojects.md index d382dbf69..5a5db49ea 100644 --- a/SoC-2025-Microprojects.md +++ b/SoC-2025-Microprojects.md @@ -12,39 +12,6 @@ There are some suggestions on how you can find some microprojects on your own in ## Ideas for microprojects -### Fix Sign Comparison Warnings in Git's Codebase - -Help improve Git's code quality by fixing sign comparison warnings in files that -currently disable these warnings. The goal is to remove instances of -`DISABLE_SIGN_COMPARE_WARNINGS` macro and fix the underlying issues properly. - -#### Steps to Complete -1. Find a C source file that contains `#define DISABLE_SIGN_COMPARE_WARNINGS` -2. Remove this #define -3. Build Git with `DEVELOPER=1` to enable compiler warnings. The `DEVLEOPER` - can be specified in your `config.mak` or as follows - - ```sh - make DEVELOPER=1 -j4 - ``` - -4. Fix all `-Wsign-compare` warnings that appear for that file: - - Pay attention to comparisons between signed and unsigned integers - - Modify variable types or add appropriate casts as needed - - Ensure the fixes don't change the code's behavior - -#### Notes -- Each file should be handled in a separate patch -- Follow Git's commit message conventions -- Test your changes thoroughly -- This is part of an ongoing effort to enable `-Wsign-compare` globally - -#### Related Patches -For context on why this is a crucial improvement to Git's codebase, checkout -[this e-mail](https://public-inbox.org/git/20241206-pks-sign-compare-v4-0-0344c6dfb219@pks.im/) -by Patrick Steinhardt. - - ### Modernize Test Path Checking in Git's Test Suite Help improve Git's test suite by converting old-style path checks to use modern From 8089e231d92ca441a7440a93b267b89a90ef360b Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sat, 31 May 2025 17:02:22 +0200 Subject: [PATCH 196/227] rn-123: add --no-hooks article --- rev_news/drafts/edition-123.md | 104 ++++++++++++++++++++++++++++++++- 1 file changed, 102 insertions(+), 2 deletions(-) diff --git a/rev_news/drafts/edition-123.md b/rev_news/drafts/edition-123.md index 5d3b52824..e0b3a05a4 100644 --- a/rev_news/drafts/edition-123.md +++ b/rev_news/drafts/edition-123.md @@ -21,9 +21,109 @@ This edition covers what happened during the months of April 2025 and May 2025. ### General --> - + +* [[PATCH] git: add --no-hooks global option](https://lore.kernel.org/git/pull.1899.git.1743719888430.gitgitgadget@gmail.com/) + + Derrick Stolee, who prefers to be called just Stolee, sent a patch + to the mailing list that added a new `--no-hooks` global option, and + an equivalent `GIT_HOOKS` environment variable, to Git. The goal was + to allow users to disable all Git hooks during command execution. + + This could be useful for expert users who would want to bypass + pre-commit hooks when they have poor performance or perform useless + checks. + + Switching between enabled and disabled hooks and other workarounds, + like setting `core.hooksPath` to a "bogus path" did not look + convenient and very safe. + + brian m. carlson, who spell their name using only lowercase letters, + replied to Stolee acknowledging the need for this functionality as + some Jenkins users already set `core.hooksPath` to `/dev/null` for + security reasons. They warned that disabling hooks could break + [Git LFS](https://git-lfs.com/) in a way that is "less noticeable + and detectable" than the current `/dev/null` approach. + + They agreed that certain hooks like pre-commit hooks should be + optional, for example to make it easy to commit some + work-in-progress that doesn't meet standards, but saw fewer reasons + to bypass hooks that could be important for repository integrity. + + Stolee agreed that some hooks are important for integrity, but said + his intention was on the side of optional hooks. + + Phillip Wood also replied to Stolee's initial email noting that + there is already `git commit --no-verify` which bypasses the + pre-commit and commit-msg hooks. He argued that hooks so slow that + users want to bypass them are self-defeating and that the solution + should be to fix the hook's performance rather than make it easier + to skip. About setting `core.hooksPath` to `/dev/null`, he asked why + it could be unsafe. In general he said he wasn't convinced that + `--no-hooks` was a good idea, and later asked for "a clearer + motivation" to better understand its usefulness. + + Stolee agreed that setting `core.hooksPath` to `/dev/null` was safe, + and said he had forgotten that could be used instead of a bogus + path. + + Junio Hamano, the Git maintainer, then replied to Phillip thanking + him for pushing back on the idea, and saying that there should be a + "compelling reason" to justify applying a change. + + Also instead of implementing options to disable hooks or + configuration in some user facing "porcelain" commands, Junio + advocated for cleaning up and refactoring these commands into new + stable "plumbing" commands designed to be easily used in scripts. + + Lucas Seiki Oshiro in the meantime replied to Phillip. Lucas had + noticed that using `/dev/null` to disable hooks wasn't mentioned in + the documentation of `core.hooksPath` even though it was tested in a + test script. He asked if Stolee's patch should therefore be turned + into a documentation patch. + + brian agreed with Lucas that documenting how to disable hooks was a + good idea even if the `--no-hooks` option wasn't implemented. + + D. Ben Knoble also replied to Stolee's initial patch. He supported + the addition of the `--no-hooks` option, sharing his own + frustrations with poorly performing or difficult-to-manage hooks. He + described how a tool re-enables hooks after every `npm install` + leading him to overuse `--no-verify`, which he considered a worse + situation. He believed there should be a safe and sane way to + disable optional client-side hooks and felt that a `--no-hooks` + option would be useful, potentially encouraging better practices + like moving certain checks to server-side hooks. + + Stolee then replied to Junio thanking him for deciding about this + and saying he would follow up with a version 2 of his patch that + would only document that setting `core.hooksPath` to `/dev/null` was + the supported mechanism to disable hooks. + + In [the version 2 of his patch](https://lore.kernel.org/git/pull.1899.v2.git.1744818135435.gitgitgadget@gmail.com/) + indeed Stolee only updated the documentation of the `core.hooksPath` + configuration option, adding the following small paragraph: + + > You can also disable all hooks entirely by setting `core.hooksPath` + > to `/dev/null`. This is usually only advisable for expert users and + > on a per-command basis using configuration parameters of the form + > `git -c core.hooksPath=/dev/null ...`. + + Lucas replied to that new patch. He suggested rewording the + documentation to focus on non-expert users rather than + experts. Stolee disagreed, explaining he intentionally targeted + expert users as a "there be dragons here" warning about the risks of + disabling hooks. + + brian supported Stolee's approach, agreeing that this feature should + be presented as expert-only due to the potential for data loss (like + missing Git LFS uploads). He appreciated Stolee's gracious pivot + from code changes to documentation. + + Junio also thanked Stolee for gracefully changing direction and + ensuring no loose ends were left after abandoning the original + approach. __Git tools and sites__ ++ [A modern theme for cgit](https://yingtongli.me/blog/2025/05/16/cgit.html) + by Lee Yingtong Li on Inane Observations blog. + Source code for described themed fork of cgit is available + at . + ## Releases From 3125af376a746da367051f1dadf0dc1b10b6149b Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Mon, 2 Jun 2025 16:23:59 +0200 Subject: [PATCH 200/227] rn-123: add GSoC 2025 article --- rev_news/drafts/edition-123.md | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/rev_news/drafts/edition-123.md b/rev_news/drafts/edition-123.md index dac024057..e65a1fa64 100644 --- a/rev_news/drafts/edition-123.md +++ b/rev_news/drafts/edition-123.md @@ -17,10 +17,31 @@ This edition covers what happened during the months of April and May 2025. ## Discussions - +* [[GSoC] Welcoming our 2025 contributors and thanking our applicants](https://lore.kernel.org/git/A2C60325-F96A-49FC-8910-035BFC209EB5@gmail.com/) + + The Git project was accepted in the + [Google Summer of Code (GSoC)](https://summerofcode.withgoogle.com/) + this year again, and 3 applicants were selected: + + - Meet Soni will work on + [the "Consolidate ref-related functionality into git-refs" project](https://summerofcode.withgoogle.com/programs/2025/projects/xVrT5e2q) + mentored by Patrick Steinhardt and Jialuo She. See Meet's + [blog](https://inosmeet.github.io/posts/) and + [repository](https://github.com/inosmeet/git) for more. + + - Lucas Seiki Oshiro will work on + [the "Machine-Readable Repository Information Query Tool" project](https://summerofcode.withgoogle.com/programs/2025/projects/fGgMYHwl) + mentored by Karthik Nayak and Patrick + Steinhardt. See Lucas' [blog](https://lucasoshiro.github.io/en/) + and [repository](https://github.com/lucasoshiro/git) for more. + + - Ayush Chandekar will work on + [the "Refactoring in order to reduce Git’s global state" project](https://summerofcode.withgoogle.com/programs/2025/projects/no7dVMeG) + mentored by Christian Couder and Ghanshyam Thakkar. See Ayush's + [blog](https://ayu-ch.github.io/archive.html) and + [repository](https://github.com/ayu-ch/git) for more. ### Reviews From 9283a5c104b05e70cc17971e932cdbc253e74e81 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Mon, 2 Jun 2025 16:25:46 +0200 Subject: [PATCH 201/227] Publish rn-123 in _posts/ --- .../edition-123.md => _posts/2025-05-31-edition-123.markdown | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename rev_news/drafts/edition-123.md => _posts/2025-05-31-edition-123.markdown (100%) diff --git a/rev_news/drafts/edition-123.md b/_posts/2025-05-31-edition-123.markdown similarity index 100% rename from rev_news/drafts/edition-123.md rename to _posts/2025-05-31-edition-123.markdown From 30c03ac1f917307b400375b043197c4b07e9a757 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Mon, 2 Jun 2025 16:25:46 +0200 Subject: [PATCH 202/227] Add draft for rn-124 --- rev_news/drafts/edition-124.md | 60 ++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 rev_news/drafts/edition-124.md diff --git a/rev_news/drafts/edition-124.md b/rev_news/drafts/edition-124.md new file mode 100644 index 000000000..06388e788 --- /dev/null +++ b/rev_news/drafts/edition-124.md @@ -0,0 +1,60 @@ +--- +title: Git Rev News Edition 124 (June 30th, 2025) +layout: default +date: 2025-06-30 12:06:51 +0100 +author: chriscool +categories: [news] +navbar: false +--- + +## Git Rev News: Edition 124 (June 30th, 2025) + +Welcome to the 124th edition of [Git Rev News](https://git.github.io/rev_news/rev_news/), +a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to +subscribe, see [the Git Rev News page](https://git.github.io/rev_news/rev_news/) on [git.github.io](http://git.github.io). + +This edition covers what happened during the months of May 2025 and June 2025. + +## Discussions + + + + + + + + + +## Other News + +__Various__ + + +__Light reading__ + + + +__Git tools and sites__ + + +## Releases + + +## Credits + +This edition of Git Rev News was curated by +Christian Couder <>, +Jakub Narębski <>, +Markus Jansen <> and +Kaartic Sivaraam <> +with help from XXX. From 38541e3b0362820856afc693bac7a128c666b448 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Mon, 2 Jun 2025 16:49:27 +0200 Subject: [PATCH 203/227] rn-123: remove 'with help from XXX' --- _posts/2025-05-31-edition-123.markdown | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/_posts/2025-05-31-edition-123.markdown b/_posts/2025-05-31-edition-123.markdown index e65a1fa64..06a76a5bc 100644 --- a/_posts/2025-05-31-edition-123.markdown +++ b/_posts/2025-05-31-edition-123.markdown @@ -243,5 +243,4 @@ This edition of Git Rev News was curated by Christian Couder <>, Jakub Narębski <>, Markus Jansen <> and -Kaartic Sivaraam <> -with help from XXX. +Kaartic Sivaraam <>. From 3b94193a7adc46d23072a87fb90eb7629c1e3548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Nar=C4=99bski?= Date: Mon, 2 Jun 2025 18:02:06 +0200 Subject: [PATCH 204/227] rn-123: Add more links --- _posts/2025-05-31-edition-123.markdown | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/_posts/2025-05-31-edition-123.markdown b/_posts/2025-05-31-edition-123.markdown index 06a76a5bc..5d4b4d95d 100644 --- a/_posts/2025-05-31-edition-123.markdown +++ b/_posts/2025-05-31-edition-123.markdown @@ -195,7 +195,15 @@ __Light reading__ by Arnold Noronha on Screenshotbot Blog. + [Fixing SSH Conflicts: Using a Separate SSH Key for GitHub](https://dev.to/hastycodea/fixing-ssh-conflicts-using-a-separate-ssh-key-for-github-4in1) by Hastycode Andreh on DEV\.to. - One trick to add is the use of `url..insteadOf`. + One trick to add is the possible use of `url..insteadOf`. ++ [The reductionist theory or rethinking of .gitignore bloat](https://dev.to/iegik/the-reductionist-theory-or-rethinking-of-gitignore-bloat-4gfo) + by Arturs Jansons on DEV\.to. + Mentions [gitignore.io](https://www.gitignore.io/), + first mentioned in passing in [Git Rev News Edition #6](https://git.github.io/rev_news/2015/08/05/edition-6/), + then linked to (with new final URL) in [Git Rev News Edition #94](https://git.github.io/rev_news/2022/12/31/edition-94/), + and [github/gitignore](https://github.com/github/gitignore) - which was + first mentioned in passing in [Git Rev News Edition #21](https://git.github.io/rev_news/2016/11/16/edition-21/), + then also linked to in [Edition #94](https://git.github.io/rev_news/2022/12/31/edition-94/), __Light reading__ From 4ae99895649e3a0bd45211017d19218eef8e3b5c Mon Sep 17 00:00:00 2001 From: Markus Jansen Date: Mon, 2 Jun 2025 20:55:49 +0200 Subject: [PATCH 206/227] Tiny corrections and rephrasings, part 2. --- _posts/2025-05-31-edition-123.markdown | 28 +++++++++++++------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/_posts/2025-05-31-edition-123.markdown b/_posts/2025-05-31-edition-123.markdown index 1f9b361af..96e3cd14c 100644 --- a/_posts/2025-05-31-edition-123.markdown +++ b/_posts/2025-05-31-edition-123.markdown @@ -29,13 +29,13 @@ This edition covers what happened during the months of April and May 2025. [the "Consolidate ref-related functionality into git-refs" project](https://summerofcode.withgoogle.com/programs/2025/projects/xVrT5e2q) mentored by Patrick Steinhardt and Jialuo She. See Meet's [blog](https://inosmeet.github.io/posts/) and - [repository](https://github.com/inosmeet/git) for more. + [repository](https://github.com/inosmeet/git) for more. - Lucas Seiki Oshiro will work on [the "Machine-Readable Repository Information Query Tool" project](https://summerofcode.withgoogle.com/programs/2025/projects/fGgMYHwl) - mentored by Karthik Nayak and Patrick - Steinhardt. See Lucas' [blog](https://lucasoshiro.github.io/en/) - and [repository](https://github.com/lucasoshiro/git) for more. + mentored by Karthik Nayak and Patrick + Steinhardt. See Lucas's [blog](https://lucasoshiro.github.io/en/) + and [repository](https://github.com/lucasoshiro/git) for more. - Ayush Chandekar will work on [the "Refactoring in order to reduce Git’s global state" project](https://summerofcode.withgoogle.com/programs/2025/projects/no7dVMeG) @@ -45,7 +45,7 @@ This edition covers what happened during the months of April and May 2025. ### Reviews -* [[PATCH] git: add --no-hooks global option](https://lore.kernel.org/git/pull.1899.git.1743719888430.gitgitgadget@gmail.com/) +* [[PATCH] git: add `--no-hooks` global option](https://lore.kernel.org/git/pull.1899.git.1743719888430.gitgitgadget@gmail.com/) Derrick Stolee, who prefers to be called just Stolee, sent a patch to the mailing list that added a new `--no-hooks` global option and @@ -170,16 +170,16 @@ __Light reading__ + [Git aliases](https://heitorpb.github.io/bla/git-aliases/) by Heitor de Bittencourt on Heitor's Log blog, which includes comparison with shell aliases, - and is only missing the trick to set git completion for `!` alias. + and is only missing the trick to set `git` completion for the `!` alias. + [Pushing a whole stack of branches with a single Git command](https://andrewlock.net/pushing-a-whole-stack-of-branches-with-a-single-git-command/) (with the help of git aliases) - by Andrew Lock on .NET Escapades + by Andrew Lock on .NET Escapades. + [Tally All Git Trailers in a Repository](https://calebhearth.com/tally-git-trailers.page), with a list of interesting and useful trailers _(with many links)_, by Caleb Hearth on his blog. + [You can use Git to version control your notes, and here’s how I do it](https://www.xda-developers.com/you-can-use-git-to-version-control-your-notes/) by Ayush Pande on XDA Developers - (with Joplin as an example of note-taking application one can use with Git). + (with Joplin as an example of a note-taking application one can use with Git). + [A Short Guide on Git for Vibe Coders](https://anfalmushtaq.com/articles/a-short-guide-on-git-for-vibe-coders) by Anfal Mushtaq on his blog. + [Version Control To The Max](https://hackaday.com/2025/05/14/version-control-to-the-max/) @@ -187,11 +187,11 @@ __Light reading__ about backing up the entire development environment (with QEMU or VirtualBox or VMWare). + [Converting a Git repo from tabs to spaces](https://eev.ee/blog/2016/06/04/converting-a-git-repo-from-tabs-to-spaces/) - with the help of "filter" gitattribute and `expand` tool (part of the _coreutils_), + with the help of the "filter" gitattribute and the `expand` tool (part of the _coreutils_), by Eevee on Fuzzy Notepad blog (2016). + [How the GitHub CLI can now enable triangular workflows](https://github.blog/open-source/git/how-the-github-cli-can-now-enable-triangular-workflows/) by Tyler McGoffin on GitHub Blog. -+ [Using git-upload-pack for a simpler CI integration](https://blog.screenshotbot.io/2025/05/09/using-git-upload-pack-for-a-simpler-ci-integration/), ++ [Using `git-upload-pack` for a simpler CI integration](https://blog.screenshotbot.io/2025/05/09/using-git-upload-pack-for-a-simpler-ci-integration/), on how Screenshotbot can now extract commit graph data from remote repositories (assuming one has SSH access to their Git repositories), by Arnold Noronha on Screenshotbot Blog. @@ -216,16 +216,16 @@ __Git tools and sites__ + [A modern theme for cgit](https://yingtongli.me/blog/2025/05/16/cgit.html) by Lee Yingtong Li on Inane Observations blog. - Source code for described themed fork of [cgit](https://git.zx2c4.com/cgit/tree/README) + The source code for this themed fork of [cgit](https://git.zx2c4.com/cgit/tree/README) is available at . Under GPL v2 license. + [AutoGit-o-Matic](https://github.com/FPGArtktic/AutoGit-o-Matic) is a Bash script that automates Git operations across multiple repositories. It helps you pull or fetch updates from multiple repositories with a single command (with dry-run capability), - and scan directories for Git repositories automatically; - it logs operations in both TXT and JSON formats, - and is configurable via INI file. + scans directories for Git repositories automatically, + logs operations in both TXT and JSON formats, + and is configurable via an INI file. Under GPL-3.0 license. + [StatsCat](https://github.com/z1cheng/statscat) is a CLI tool to get per-author and per-directory statistics of all your Git repositories. From 0c8e09583e31e76de3e0386976cb538d0a9ee321 Mon Sep 17 00:00:00 2001 From: Bruno Brito Date: Tue, 24 Jun 2025 13:57:09 +0100 Subject: [PATCH 207/227] rn-124: Add new Tower releases + Light Reading --- rev_news/drafts/edition-124.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-124.md b/rev_news/drafts/edition-124.md index 06388e788..5dd37c0fc 100644 --- a/rev_news/drafts/edition-124.md +++ b/rev_news/drafts/edition-124.md @@ -39,6 +39,7 @@ __Various__ __Light reading__ ++ [How to Install Gitea (with SQLite3 and HTTPS!) on a VPS](https://www.git-tower.com/blog/how-to-install-gitea) - +## Community Spotlight: Luca Milanesi + +_Luca Milanesio is long standing contributor to both JGit and Gerrit +Code Review, an open-source veteran who's been accelerating Git +workflows for 30+ years—from founding GerritHub.io to pioneering +AI-powered repository optimization research._ + +_This is a continuation of our initiative to interview community +contributors outside of our mailing list. Our previous interviews +were with [VonC in edition 106][vonc] and [Chris Torek in edition 120][torek]._ + +- **Who are you and what do you do?** + + My name is Luca Milanesio, and I am the CEO of GerritForge Inc., + a company I founded 6 years ago, which is fully dedicated to the + development and support of Git and the Gerrit Code Review ecosystem + for medium and large enterprises around the globe. + + I am a passionate Open-Source contributor, and I have helped many + projects grow over my 30+ years of software development career, + including Jenkins, JGit, GitBlit, Swagger/Open-API, Kibana, Avro, + and Gerrit Code Review. + + I am a maintainer and release manager of Gerrit Code Review and a + member of its Engineering Steering Committee and committer of the + JGit project. + + I introduced GerritHub.io 11 years ago, a free Gerrit Code Review + service for all public and private projects on GitHub. It has over + 50k subscribers and is currently used by over 300 organisations and + open-source projects worldwide. + + My latest work is research about using AI, specifically reinforcement + learning, to dynamically understand and learn how Git repository metrics + evolve and execute actions to improve their performance by up to 100x. + The research has been selected for the 50th edition of the [IEEE/ACM + International Conference on Software Engineering in Ottawa (CA)][3]. + +- **What would you name your most important contribution to the Git ecosystem?** + + I have introduced a multi-site replication plugin between the Git + repositories managed by JGit and Gerrit Code Review [[ref][1]]. + + Google introduced the multi-site replication concept in JGit from + the very beginning in 2012, [with the introduction of DFS][2], a + multi-site distributed storage mechanism for Git. Although DFS was + a completely abstract interface layer that could have been + implemented on top of any distributed storage, in practice, it was + effectively implemented and used only by Google in its internal + implementation of JGit. + + In the meantime, the rest of the Open-Source community was left with + the traditional filesystem-based implementation and its extensions + to work effectively and efficiently with a shared filesystem (e.g., NFS). + I started using the NFS implementation of JGit on GerritHub.io and + contributed many patches and improvements over the years. Still, I + was soon hit with all the quirks and limitations of the NFS protocol + in trying to mock the “illusion” of a POSIX filesystem over a network + protocol, including locking, stale file handles, and caching + inconsistencies. After working for 4 years on the NFS implementation + of JGit on GerritHub.io on a shared filesystem, I forked the + [high-availability plugin project][4] and started the + [multi-site project][1], which has now entered its 6th year of adoption. + + Thanks to the multi-site support, anyone worldwide can use Git + replication across Gerrit primary nodes without fearing a + split-brain disaster, as it [historically happened years ago][5] + on a large-scale Git service. + +- **With over 30 years in software development, how have you seen version + control systems evolve, and what makes Git stand out in this evolution?** +` + I started using RCS on my Unix box for tracking the local version of files + and avoiding bad surprises, and since then I’ve seen so many so-called + revolutions of the version control that promised “the moon” but ended up + creating yet another commercial silos. To name a few, consider + [Rational ClearCase][clearcase] and [Perforce][perforce], and the legacy + they have made for the software industry. + + In my experience, version control is the foundation of any Software + Development Life Cycle (SDLC for short) and should always be thought of + as an evolving technology: I don’t believe that Git is here to stay + forever as-is, even though it would be difficult to imagine an + Open-Source project starting today not using Git as version control. + + But if you roll back to the year 2000s, you could have swapped Microsoft + with VA Software and Git with Subversion, and asked the same question: + _`“What version control and hosting site should a new Open-Source project + use?”_ I believe the answer would differ significantly from the one you + have today [[ref][6]]. + + What makes Git different from its predecessors is its adoption in + large Open-Source projects unlikely to be discontinued any time soon, + such as Linux and the Android OS project. With the advent of IoT and + the extensive adoption of Android OS everywhere, from appliances to + aerospace and automotive, Git version control has become responsible + for powering the SDLC of most devices we use daily. + + A second factor that has brought Git to the world stage as the future + of VCS is its ability to abstract from any vendor bias and be truly + driven by only its user base: software developers. Git was invented + by Linus Torvalds because he needed it, not because a company X wanted + to disrupt the market of the existing version control system Y to + achieve goal Z. + + A third factor is the growth of other Git-compatible version control + systems, such as [JJ (aka Jujutsu)][7]. Git is, first of all, a data + format for versioned directories and BLOBs and a protocol on how this + data can be safely transferred between peers: no implementation-specific + quirks, no vendor lock-ins, no silos, just data and protocol. + This has led other developers, like [Martin Von Zweigbergk][martinvonz] + (Senior Software Engineer @Google), to create version control systems + on top of it, assuring interoperability with the existing code and + innovation simultaneously. + + This is unprecedented and unique in the history of VCSs I have seen + in my whole 30+ career as a Software Developer. Do I believe that + Git will continue to exist in its current form in 25 years from + now? No, I believe it will be very different in the future, but + its foundations will remain the same, and I see many more + evolutions similar to Martin’s JJ project. + +- **You've been working on comparing Git reftable implementations + with JGit alternatives. Could you walk us through what motivated + this research and preview any interesting findings you've + discovered?** + + Being the Gerrit Code Review release manager comes with many + responsibilities, including verifying that whatever we release + is production-ready and always better than what has ever been + released. That also includes, first and foremost, the Git + performance, following Shawn Pearce’s (Gerrit Code Review + project founder, R.I.P.) mantra, “performance is a feature.” + + We have been working in Q1 of 2025 to release and certify + [Gerrit v3.12][gerrit-3.12], which includes the latest and + greatest of JGit’s implementation of reftable, which was + available since 2019 but not used in Gerrit because of the + lack of support from the C Git project. Some parts of Gerrit + use the “C Git” implementation for some scripting side + and replication; therefore, a Git repository with reftable + would not have been compatible with Gerrit until Git v2.45, + which was [released last year][8]. + + In February 2024, at the time of the release of reftable + support in Git v2.45, I was busy with my AI research work + for [optimising Git performance][3], and I immediately + thought that it was the right time to put JGit and C Git + implementation of reftable in the arena and see how they + interoperate and perform during heavy workload. + + The first finding was that reftable has an entirely different + philosophy from any other ref storage used before by Git. + Loose refs and packed refs are both based on the concept of + file-level locking and caching. Both C Git and JGit ensure + that every update is atomic by carefully creating and releasing + ref-level or packed-refs-level lock files and using atomic + filesystem updates to ensure that the concurrency of reads + and updates does not impact the normal functionality of + in-flight operations. JGit has a “wait for lock” mechanism + where the in-flight operation would wait for the lock file + to be released before acquiring the resource, with an exponential + backoff mechanism on packed-refs, whilst C Git just fails the + operation with a lock failure. + + Reftable is different because it is designed to be highly + scalable and performant, compared to loose refs or packed-refs. + To prioritise performance and low latency, reftable decides + to give up thread safety and locking altogether, relying on an + optimistic locking pattern. In a nutshell, whilst packed-refs + blocks the file and waits until it is released, reftable allows + multiple users to access the same data on disk and refer + directly without locking. The operation is always safe because, + unlike packed-refs and loose-refs, the reftable files are always + immutable and therefore safe to be shared concurrently without + any locks. + + What’s the catch? The concurrent updates of the same refs by + two different threads or processes will want to update the + list of reftables simultaneously. Whoever manages to perform + the update is gaining the “logical lock” and will cause any + other concurrent threads or processes to fail the whole + transaction they may have prepared. + + Why is this different from loose-refs and packed-refs? The + client interaction and compensation behaviour with a reftable + needs to be substantially different: if with loose-refs or + packed-refs the client was retrying the operation, or just + waiting in case of JGit, with reftable the client should + abort the whole logical operation, destroy the current + snapshot of the reftable read in memory, and restart the + whole transaction from scratch. + + The issue here is that the reftable is simply configured + as a storage format for the refs, and the higher layers + are currently unprepared to manage the difference in + behaviour. This is currently causing trouble in the + JGit world, with [some initial issues reported][9] at the + API level, like the lack of “auto-refresh” and even more + problematic [stability problems reported on Gerrit Code Review][10] + when using reftable from concurrent threads. + + The $1M question about reftable is, *"Is it ready for mainstream + use in production?”* My answer is obviously a bold yes, but with + a very important caveat: whoever is using reftable should be aware + of what it is and how it should be used, and cannot be simply used + blindly, assuming that it works exactly as a loose-ref or + packed-refs. Reftable is ready, Git and Gerrit Code Review aren’t + ready yet to leverage it and I am sure they will soon be adjusted + to get the best use of it. + +- **What's your approach to load testing Git repositories \- which + tools work best, what key metrics should organizations monitor, + and what are some interesting findings from your research in + this area?** + + At GerritForge, we’ve been investing a lot of time and effort + in testing and improving the performance of Git repositories, + as demonstrated by the recent research paper published on the + use of AI to improve repository performance 100x times. + + Over the years, we have developed much experience, successfully + using the [Gatling framework][11] and extending it to support + the [Git protocol over HTTPS and SSH][12]. The use of Gatling + is great because it allows us to create very comprehensive + scenarios using a DSL (domain-specific language), which is + high-level and can replicate real-life user behaviour. + Replicating real-life traffic is paramount when testing a Git + repository performance because it allows creating future volumes + in terms of length of delta-chains, number and distribution of + refs, and number of packfiles / loose objects, that reflect the + project lifecycle. + + Another key aspect of generating a workload against a Git repository + is scaling up the clients and making their requests parametric enough + to avoid different requests locking each other. With Gatling, you + have the concept of “user sessions” where different logical users + can have dynamic variables used in the Git requests that can be used + for making the operation independent (e.g., branch name fragments, + or tags) and avoiding them from failing or ending up in a deadlock. + + As part of [our research work][3], I managed to recreate 10 years + of Git traffic generated by hundreds of users and execute it in + just 12 hours, thanks to Gatling and the Git-Gatling plugin. + + An interesting finding from the research and experiments is that + over 95% of the CPU time is spent in serving git-upload-pack + commands (not really a surprise though), of which 90% of it is + spent in [the “search-for-reuse” phase][13]. + + A second interesting finding is that the presence of a bitmap, + single or multi-pack, is not a guarantee of fast and effective + Git operations: the quality of the bitmap also matters a lot. + A bad bitmap could be so detrimental that removing it could + make the Git repository much faster, which may sound + counterintuitive. + +- **Based on your testing, what improvements do you think are most + needed in Git's core implementation?** + + I believe that the Git GC process needs a full revamp: the way + it is designed today isn’t suitable for large repositories. I + have presented a simple “role play” demo of what could happen + to a large mono-repo when you are trying to resolve a production + slowdown [running a Git GC][14]: in my imaginary scenario, a + large team of developers is pushing a lot of changes to get the + latest features through on their product’s mono-repo, not unlike + what happens when a large developer conference is approaching + and company ABC wants to launch a new version of their product DEF. + The operation raises the main metrics of the repository and makes + the “search-for-reuse” phase explode, causing the complete blockage + of the CI/CD pipeline. The Git SCM Manager knows what to do … and + runs a Git GC, causing even more damage than the original problem. + + I believe Git GC needs to be redesigned from the ground up. + Instead of being a simple sequence of operations, it needs to be + much more intelligent and adaptive to perform the right operation + at the right time. This could also be *“do nothing”* as the CPU + load is too high or the volatility of the repository is diverging. + +- **How do you see the relationship between Git and JGit evolving + in the future?** + + I believe Git and JGit have a wonderful symbiosis of ideas and + code: many popular features in JGit ended up innovating and + inspiring similar implementations in Git (e.g., bitmap, + ref-table, just to name a couple). Also, the other way around + is happening, with the implementation of MIDX in JGit recently + merged, thanks to the collaboration of GerritForge and Google. + + I like Git because it makes the language absolutely irrelevant + to the implementation: extending Git doesn’t mean you have to + write C code, and you can always start a brand new Git functionality + in a language XYZ in the future. Git is all about data and protocol + specification, not language, code, or operating system. + + I believe that should remain the case, and I am looking forward to + new languages implementing and innovating on Git, like the recent + [Gitoxide project][15], a pure-native implementation in Rust. + +- **If you could get a team of expert developers to work full-time + on something in Git for a full year, what would it be?** + + I may repeat myself, but I would redesign the Git GC command from + the ground up. + +- **If you could remove something from Git without worrying about + backwards compatibility, what would it be?** + + Well, I would get rid of SHA-1 altogether immediately, forget + about the legacy, and force everyone to use SHA-256 … but + change requires time. + +- **What is one of your most favourite features of Git?** + + I thank all the Git developers every single day for the + interactive rebase. I use it as my bread and butter every + morning. + +- **What is your favorite Git-related tool/library, outside of Git itself?** + + I am shamelessly admitting that I love Git command line and + I do not feel I need anything else as a tool or library to + interact with it. Many people find it confusing, and I agree + that some syntax could be misleading. Nevertheless, it is worth + using it, proposing changes, and improving how it works and is + perceived by the developers. + + A tool that requires other tools is a symptom of a problem. + +- **Could you brief a bit about one of your most memorable experience + with Git?** + + As you haven’t mentioned if the experience should be positive or + negative, I always mention the world-stage attention I got from + force-pushing hundreds of Git repositories on the Jenkins CI + organisation [over 12 years ago][16]. It was bad and good at + the same time, because despite the panic caused in hundreds of + Jenkins CI projects, it demonstrated that force pushing isn’t + a destructive operation, and all the BLOBs were easily recovered, + and the refs pointed again to the expected SHA1. + + Also, my unfortunate mistake highlighted the resilience of the + Git repository model, where there isn’t a “single source of truth” + and GitHub’s repository is just “one of the repositories peers” + around the globe. You can always recover from any type of damage + with Git, at least from what I’ve seen in my 15 years of + contributing and using it with real-life large-scale repositories + and customers. + +- **What is your advice for people who want to start using Git? + Where and how should they start?** + + This could have been a valid question 15 years ago, when Git was + still “quite recent” and not widely adopted yet. Nowadays, Git is + taught at school and universities and has become the de facto + standard of any Open-Source project around the globe. I was also + pleasantly surprised to learn that my 10-year-old son was + introduced to Git by his Computer Science teacher at primary school. + +- **There's a common conception that "Git is confusing". What are your + thoughts about the same?** + + I believe the most confusing part of Git is the working copy and the + staging area. That’s the reason why [JJ][7] gets rid of it altogether + and introduces the concept of “unnamed” commit. That’s genius from + Martin Von Zweigbergk, if you think about it: you just stage files + because you’d like to create a commit. So the stage is the + “next commit you’re about to write”, therefore the unnamed commit. + +- **If there’s one tip you would like to share with other users of Git, + what would it be?** + + Never use an IDE to manage your Git repository and commits: always + stay in control of what happens and learn something every day by using + the Git command line. + +- **If there’s one tip you would like to share with other Git developers, + what would it be?** + + I am not currently contributing to C Git, so my tip would be more for + JGit developers instead. I would love to see more end-to-end JGit + features and protocols testing using tools like [Gatling][11] + and the [Git-Gatling plugin][12]. + +- **Anything else that you'd like to share with us?** + + In the future, I’d like to see Git become just one standard feature + of each operating system: anyone should version a file on their + system, regardless of whether that file is source code, a document, + a video, or a drawing. Maybe it is not a random event that the father + of Linux is also the creator of the Git version control system, + isn’t it? + + Thanks for allowing me to share my experience with Git and my history + of being a JGit contributor and committer. + +[vonc]: https://git.github.io/rev_news/2023/12/31/edition-106/#community-spotlight-vonc +[torek]: https://git.github.io/rev_news/2025/02/28/edition-120/#community-spotlight-chris-torek +[clearcase]: https://en.wikipedia.org/wiki/IBM_DevOps_Code_ClearCase +[perforce]: https://www.perforce.com/ +[martinvonz]: https://github.com/martinvonz +[gerrit-3.12]: https://www.gerritcodereview.com/3.12.html +[1]: https://gerrit.googlesource.com/plugins/multi-site/+/refs/heads/master/DESIGN.md +[2]: https://review.gerrithub.io/c/eclipse-jgit/jgit/+/3930 +[3]: https://conf.researchr.org/home/icse-2025 +[4]: https://gerrit.googlesource.com/plugins/high-availability +[5]: https://github.blog/news-insights/company-news/oct21-post-incident-analysis/ +[6]: https://en.wikipedia.org/wiki/SourceForge +[7]: https://jj-vcs.github.io/jj/latest/ +[8]: https://github.com/git/git/blob/master/Documentation/RelNotes/2.45.0.adoc +[9]: https://github.com/eclipse-jgit/jgit/issues/102 +[10]: https://github.com/eclipse-jgit/jgit/issues/130 +[11]: https://gatling.io/ +[12]: https://docs.gatling.io/reference/script/third-parties/ +[13]: https://github.com/eclipse-jgit/jgit/blob/46d0d1b40b147e4282043a6c404947166c71be93/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java#L1452 +[14]: https://youtu.be/xhxrGxvChU0?t=395 +[15]: https://github.com/GitoxideLabs/gitoxide +[16]: https://www.infoq.com/news/2013/11/use-the-force/ + ## Other News From 99683da70c90b6123ee50faadbc3b3970a887336 Mon Sep 17 00:00:00 2001 From: Luca Milanesio Date: Mon, 30 Jun 2025 13:54:10 +0100 Subject: [PATCH 211/227] Fix typo on Luca's name on edition-124.md Amend Luca Milanesio's name in the community spotlight and fix a small typo associated with it. --- rev_news/drafts/edition-124.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rev_news/drafts/edition-124.md b/rev_news/drafts/edition-124.md index fa52f9d96..2d4cf7e28 100644 --- a/rev_news/drafts/edition-124.md +++ b/rev_news/drafts/edition-124.md @@ -29,9 +29,9 @@ This edition covers what happened during the months of May 2025 and June 2025. ### Support --> -## Community Spotlight: Luca Milanesi +## Community Spotlight: Luca Milanesio -_Luca Milanesio is long standing contributor to both JGit and Gerrit +_Luca Milanesio is a long standing contributor to both JGit and Gerrit Code Review, an open-source veteran who's been accelerating Git workflows for 30+ years—from founding GerritHub.io to pioneering AI-powered repository optimization research._ From 632c8b639f75a17407f6739522d270ff6387e8c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Nar=C4=99bski?= Date: Mon, 30 Jun 2025 17:32:15 +0200 Subject: [PATCH 212/227] rn-124: Add link to paper mentioned in interview --- rev_news/drafts/edition-124.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rev_news/drafts/edition-124.md b/rev_news/drafts/edition-124.md index 2d4cf7e28..de21249f2 100644 --- a/rev_news/drafts/edition-124.md +++ b/rev_news/drafts/edition-124.md @@ -462,6 +462,12 @@ __Light reading__ __Easy watching__ --> +__Scientific papers__ ++ Shane McIntosh, Luca Milanesio, Antonio Barone, Jacek Centkowski, Marcin Czech, Fabio Ponciroli: + _"Using Reinforcement Learning to Sustain the Performance of Version Control Repositories"_, + ICSE 2025: 47th International Conference on Software Engineering, + (preprint) + __Git tools and sites__ From bcdd79a89a90671726f5d3b66e7fb9573d8e2fa6 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Mon, 30 Jun 2025 18:21:11 +0200 Subject: [PATCH 213/227] rn-124: add stash and submodule article --- rev_news/drafts/edition-124.md | 57 ++++++++++++++++++++++++++++++++-- 1 file changed, 55 insertions(+), 2 deletions(-) diff --git a/rev_news/drafts/edition-124.md b/rev_news/drafts/edition-124.md index de21249f2..968fb340e 100644 --- a/rev_news/drafts/edition-124.md +++ b/rev_news/drafts/edition-124.md @@ -25,9 +25,62 @@ This edition covers what happened during the months of May 2025 and June 2025. ### Reviews --> - + +* [[BUG] git stash incorrectly showing submodule branch instead of superproject branch](https://lore.kernel.org/git/TO1PPF29324B4CE6D3518208073452C3C51CD97A@TO1PPF29324B4CE.CANPRD01.PROD.OUTLOOK.COM/) + + Stuart MacDonald sent a bug report to the mailing list. The report + described a workflow where people worked on a UI project that + included a hardware SDK as a submodule. Both the UI project (the + "superproject") and the SDK project (the submodule) had their own + branches. + + When using `git stash` on a bug fix branch on the superproject, + while the submodule was on a feature branch, it appeared that the + command `git stash list` output a message, like: + + `stash@{0}: On feature_sdk_foo: debugging` + + indicating the stash had been created on the submodule's branch + instead of the superproject's branch. The branch `feature_sdk_foo` + didn't even exist in the superproject. + + Stuart mentioned he thought this used to work correctly around 2021, + though he wasn't 100% certain. + + K Jayatheerth replied to Stuart confirming the bug happened on + different OSes, showing minimal steps to reproduce it, and saying it + was "one of the most interesting Git bugs" he had seen in a while. + + Jayatheerth came back later with + [a patch](https://lore.kernel.org/git/20250512164001.62065-1-jayatheerthkulkarni2005@gmail.com/) + that fixed the bug. It appeared that the branch name was obtained + via the `refs_resolve_ref_unsafe()` function, which returns a + pointer to a static buffer, but that static buffer was overwritten. + To fix this, the patch copied the branch name instead of pointing to + the static buffer. + + Stuart thanked Jayatheerth even though he couldn't rebuild Git with + the patch. + + Junio Hamano, the Git maintainer, replied to the patch with small + suggestions, while Eric Sunshine noted that the change should also + be accompanied by a new test. + + Jayatheerth replied to Eric and Junio saying he would fix the small + issues and add tests, which he later did in + [an updated patch](https://lore.kernel.org/git/20250608063537.233243-1-jayatheerthkulkarni2005@gmail.com/). + + René Scharfe reviewed the updated patch and suggested a number of + improvements to the code and the test. + + Jayatheerth then sent + [a v2 of his patch](https://lore.kernel.org/git/20250608144542.275836-1-jayatheerthkulkarni2005@gmail.com/) + which addressed René's comments. Junio reviewed it and suggested + further improvements. + + [The v3 patch from Jayatheerth](https://lore.kernel.org/git/20250611014204.24994-1-jayatheerthkulkarni2005@gmail.com/) + addressed Junio's comment and was merged. ## Community Spotlight: Luca Milanesio From 67463424a7cc45fb629ed55552ceccec3e9f587f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Nar=C4=99bski?= Date: Mon, 30 Jun 2025 23:45:55 +0200 Subject: [PATCH 214/227] rn-124: Add links to various news, articles, and tools --- rev_news/drafts/edition-124.md | 116 ++++++++++++++++++++++++++++++++- 1 file changed, 115 insertions(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-124.md b/rev_news/drafts/edition-124.md index 968fb340e..e38bdb65d 100644 --- a/rev_news/drafts/edition-124.md +++ b/rev_news/drafts/edition-124.md @@ -506,10 +506,99 @@ were with [VonC in edition 106][vonc] and [Chris Torek in edition 120][torek]._ ## Other News __Various__ - ++ [[ANNOUNCE] Git v2.50.0](https://lore.kernel.org/git/xmqq1prj1umb.fsf@gitster.g/T/#u) + by Junio C Hamano on the Git mailing list. ++ [Highlights from Git 2.50](https://github.blog/open-source/git/highlights-from-git-2-50/) + by Taylor Blau on GitHub Blog.
+ Mentions + improvements for multiple cruft packs, including `git repack --combine-cruft-below-size` + (and improvements to it's `--max-cruft-size` option), + incremental multi-pack reachability bitmaps (highly experimental), + "ort" merge strategy replacing "recursive" strategy entirely, + various `git cat-file` improvements, `git maintenance` new tricks, and more. ++ [What’s new in Git 2.50.0?](https://about.gitlab.com/blog/what-s-new-in-git-2-50-0/) + by Justin Tobler on GitLab Blog.
+ Mentions + new [git-diff-pairs(1)](https://git-scm.com/docs/git-diff-pairs) command + which accepts "raw" formatted filepair info (from e.g. `git diff-tree`) + as input on stdin to determine exactly which patches to output, + batched reference updates with [git-update-ref(1)](https://git-scm.com/docs/git-update-ref) + and its new `--batch-updates` option + (which allows the updates to proceed even when one or more reference updates fails), + new `--filter` option for [git-cat-file(1)](https://git-scm.com/docs/git-cat-file), + improved performance when generating bundles with [git-bundle(1)](https://git-scm.com/docs/git-bundle) + (used by GitLab to generate repository backups + and also as part of the [bundle-URI](https://git-scm.com/docs/bundle-uri) mechanism), + and better bundle URI unbundling. __Light reading__ + [How to Install Gitea (with SQLite3 and HTTPS!) on a VPS](https://www.git-tower.com/blog/how-to-install-gitea) ++ [Reduce the load on GitLab Gitaly with bundle URI](https://about.gitlab.com/blog/reduce-the-load-on-gitlab-gitaly-with-bundle-uri/). + Discover what the bundle URI Git feature is, how it is integrated into Gitaly, + configuration best practices, and how GitLab users can benefit from it. + GitLab Blog post writen by Olivier Campeau. ++ [How we decreased GitLab repo backup times from 48 hours to 41 minutes](https://about.gitlab.com/blog/how-we-decreased-gitlab-repo-backup-times-from-48-hours-to-41-minutes/) + by Karthik Nayak and Manuel Kraft on GitLab Blog. + Describes how GitLab team tracked a performance bottleneck in `git bundle create` + to a 15-year-old Git function and fixed it. ++ [Working with stacked branches in git (part 2)](https://andrewlock.net/working-with-stacked-branches-in-git-part-2/) + by Andrew Lock on his blog, \.NET Escapades, continues where + [Working with stacked branches](https://andrewlock.net/working-with-stacked-branches-in-git-is-easier-with-update-refs/) left + (which was mentioned in [Git Rev News Edition #93](https://git.github.io/rev_news/2022/11/30/edition-93/)) ++ [Git: please stop squash merging!](https://lucasoshiro.github.io/posts-en/2024-04-08-please_dont_squash/) + and [Git: the danger of squash merging submodules](https://lucasoshiro.github.io/posts-en/2024-06-27-squash-submodule/) + by Lucas Seiki Oshiro on his GitHub Pages-powered personal blog. + + The first of those blog posts mentions + [Squash commits considered harmful](https://dev.to/wesen/squash-commits-considered-harmful-ob1) by Manuel Odendahl and + [Squash merges are evil](https://medium.com/bananatag-engineering-blog/squash-merges-are-evil-171f55139c51) by L. Holanda. + + See for example [Combining branches](https://programming.dev/pictrs/image/0fe7c7bd-b762-453f-bac7-ed2e34d44ba0.png) (PNG) + comic by Julia Evans (@b0rk) about differences between merge, rebase, and squash merge. ++ [Cleaning up gone branches](https://haacked.com/archive/2025/04/17/git-gone/) + by Phil Haack on his You've Been Haacked blog. + Describes how to delete all the branches that have been merged into the default branch, + even if the project uses Squash and Merge when merging PRs + (also known as squash merge). ++ [Part 7: Office Migration from Source Depot to Git, or how I learned to love DevEx](https://danielsada.tech/blog/carreer-part-7-how-office-moved-to-git-and-i-loved-devex/) + by Daniel Sada on his personal blog + (part of his [My career so far](https://danielsada.tech/series/my-career-so-far/) series). + + Nicely complements [Microsoft’s Performance Contributions to Git in 2017](https://devblogs.microsoft.com/devops/microsofts-performance-contributions-to-git-in-2017/) + by Derrick Stolee on Microsoft Dev Blogs, mentioned in + [Git Rev News Edition #40](https://git.github.io/rev_news/2018/06/20/edition-40/), + and other posts at . ++ [Git Branch Manager: a manager for git branches](https://daveschumaker.net/git-branch-manager-a-manager-for-git-branches/) + by Dave Schumaker on his blog, + describes how he created [Git Branch Manager](https://github.com/daveschumaker/gbm) + tool by "vibe coding" with Claude Code. The 'P.S.' part just kills it... ++ [no more gitmojis](https://kjelsrud.dev/blog/no-more-gitmojis/) + on Sids' blog; moving from [gitmojis](https://gitmoji.dev/) + to just using [conventional commits](https://conventionalcommits.org/). + + [Gitmoji](https://gitmoji.dev/) was first mentioned in [Git Rev News Edition #47](https://git.github.io/rev_news/2019/01/23/edition-47/), + though then under a [different URL](https://gitmoji.carloscuesta.me/) + (which now redirects to the current one). + + The similar [Emoji-Log](https://github.com/ahmadawais/Emoji-Log) commit log messages standard + was mentioned in [Git Rev News Edition #101](https://git.github.io/rev_news/2023/07/31/edition-101/). + + The [Conventional Commits](https://www.conventionalcommits.org/) specification + was first mentioned in [Git Rev News Edition #52](https://git.github.io/rev_news/2019/06/28/edition-52/), + and in many editions since. ++ [`git diff --ignore-all-space` makes code review way easier](https://garrit.xyz/posts/2025-06-11-git-diff-ignore-all-space-makes-code-reviews-way-easier) + by Garrit Franke on Garrit's Notes blog; + a TIL (Today I've Learned) style post. ++ [Per-project git commit templates](https://tylercipriani.com/blog/2025/05/21/git-commits/) + by Tyler Cipriani on his blog. + Mentions in passing different commit guidelines used by various projects, like + [Conventional Commits](https://www.conventionalcommits.org/), + [Gitmoji](https://gitmoji.dev/), + [Problem/Solution format](https://zeromq.org/how-to-contribute/#write-good-commit-messages) used by ZeroMQ, and + [Acked-by:, Cc:, and Co-developed-by: trailers](https://docs.kernel.org/process/submitting-patches.html#when-to-use-acked-by-cc-and-co-developed-by) + used by Linux kernel. ++ [The history of change-packing tools at Microsoft (so far)](https://devblogs.microsoft.com/oldnewthing/20180122-00/) + by Raymond Chen on Microsoft Dev Blogs: The Old New Thing (2018).
+ Change-packing is a way to save whole changeset or commit to a single file, + to be able to save changes without committing them (like `git stash`), + or to get another developer’s opinion on code you’ve written (_buddy build_), etc. ++ [GIF: The Git Interchange Format](https://willhbr.net/2025/06/16/gif-the-git-interchange-format/) + by Will Richardson on his blog, + about how to cram a whole git repo (with history) into an animated GIF. + + + + + + + +## Other News + +__Various__ + + +__Light reading__ + + + +__Git tools and sites__ + + +## Releases + + +## Credits + +This edition of Git Rev News was curated by +Christian Couder <>, +Jakub Narębski <>, +Markus Jansen <> and +Kaartic Sivaraam <> +with help from XXX. From 0e0f2164ce96ffd80938bd74e0ae6f4b1809ef5e Mon Sep 17 00:00:00 2001 From: Kaartic Sivaraam Date: Sun, 13 Jul 2025 17:30:54 +0530 Subject: [PATCH 227/227] Hacking-Git: remove review club from the list of resources Ref: https://lore.kernel.org/git/CAFySSZBgG3QyqEXSs3t4LzGYw1VJrHPx4gomT0zSsWcvQLezAQ@mail.gmail.com/ --- Hacking-Git.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Hacking-Git.md b/Hacking-Git.md index c8e9fef2b..c43106897 100644 --- a/Hacking-Git.md +++ b/Hacking-Git.md @@ -88,10 +88,6 @@ suggest improvements. Thanks! * [Git Merge conference](https://git-merge.com/). -* [Review Club announces and discussions on the list](https://lore.kernel.org/git/?q=s%3A%22Review+Club%22). - -* [Review Club meeting notes](https://docs.google.com/document/d/14L8BAumGTpsXpjDY8VzZ4rRtpAjuGrFSRqn3stCuS_w) Google doc. - * [Discussions about Contributor(s) Summits on the list](https://lore.kernel.org/git/?q=s%3AContributor*+Summit) ## Branching workflow