From 95760d5f6447999cf5dc4b6d0f71deb439058c84 Mon Sep 17 00:00:00 2001 From: Taylor Blau Date: Tue, 21 Mar 2023 14:08:06 -0400 Subject: [PATCH 001/756] SoC-2022-Microprojects.md: clarify exit-code microproject The original description is somewhat confusing, and has been the source of real-world confusion on the mailing list. Let's clarify what we are trying to promote and avoid, as well as give some examples and background about our integration test suite. (Note: I don't think we ever wrote any new microproject ideas for GSoC 2023, and ISTM that we are just reusing the ones from 2022. That's fine, and is the reason that I made these changes in the SoC-2022 file instead of creating a new one). Signed-off-by: Taylor Blau --- SoC-2022-Microprojects.md | 54 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 51 insertions(+), 3 deletions(-) diff --git a/SoC-2022-Microprojects.md b/SoC-2022-Microprojects.md index 225fb1afaf..250c7b4693 100644 --- a/SoC-2022-Microprojects.md +++ b/SoC-2022-Microprojects.md @@ -46,17 +46,65 @@ functions. 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 pipes in git related commands in test scripts +### 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. -The git command should be on the left side of the pipe. - 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 From f6d34b30a6b779101a26ab7183e09e83de87b6d2 Mon Sep 17 00:00:00 2001 From: Bruno Brito Date: Wed, 22 Mar 2023 13:07:45 +0100 Subject: [PATCH 002/756] rn-97: Add "Integrating 1Password SSH with Git (and Tower!)" article --- rev_news/drafts/edition-97.md | 1 + 1 file changed, 1 insertion(+) diff --git a/rev_news/drafts/edition-97.md b/rev_news/drafts/edition-97.md index e5fb85eb10..12d2c8f134 100644 --- a/rev_news/drafts/edition-97.md +++ b/rev_news/drafts/edition-97.md @@ -44,6 +44,7 @@ __Various__ __Light reading__ + [How to Improve Performance in Git: The Complete Guide](https://www.git-tower.com/blog/git-performance/) by Bruno Brito on Tower’s blog. ++ [Integrating 1Password SSH with Git (and Tower!)](https://www.git-tower.com/blog/1password-ssh-tower/) by Bruno Brito on Tower’s blog. ## Releases - ++ Tower for Windows [4.3](https://www.git-tower.com/release-notes/windows?show_tab=release-notes) ## Other News From effb7c1c9cc8ed3d09a86fc449d6a8e6eac3da87 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 29 Mar 2023 10:58:06 +0200 Subject: [PATCH 004/756] rn-97: add releases --- rev_news/drafts/edition-97.md | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/rev_news/drafts/edition-97.md b/rev_news/drafts/edition-97.md index e9a220899e..6489025231 100644 --- a/rev_news/drafts/edition-97.md +++ b/rev_news/drafts/edition-97.md @@ -34,6 +34,34 @@ This edition covers what happened during the months of February 2023 and March 2 --> ## Releases + ++ Git [2.40.0](https://public-inbox.org/git/xmqqjzzkv8xz.fsf@gitster.g/), +[2.40.0-rc2](https://public-inbox.org/git/xmqqy1o8wdgi.fsf@gitster.g/), +[2.40.0-rc1](https://public-inbox.org/git/xmqqilfknzen.fsf@gitster.g/) ++ Git for Windows [2.40.0(1)](https://github.com/git-for-windows/git/releases/tag/v2.40.0.windows.1), +[2.40.0-rc2(1)](https://github.com/git-for-windows/git/releases/tag/v2.40.0-rc2.windows.1), +[2.40.0-rc1(1)](https://github.com/git-for-windows/git/releases/tag/v2.40.0-rc1.windows.1), +[2.40.0-rc0(1)](https://github.com/git-for-windows/git/releases/tag/v2.40.0-rc0.windows.1) ++ libgit2 [1.6.3](https://github.com/libgit2/libgit2/releases/tag/v1.6.3), +[1.6.2](https://github.com/libgit2/libgit2/releases/tag/v1.6.2) ++ GitHub Enterprise [3.8.1](https://help.github.com/enterprise-server@3.8/admin/release-notes#3.8.1), +[3.7.8](https://help.github.com/enterprise-server@3.7/admin/release-notes#3.7.8), +[3.6.11](https://help.github.com/enterprise-server@3.6/admin/release-notes#3.6.11), +[3.5.15](https://help.github.com/enterprise-server@3.5/admin/release-notes#3.5.15), +[3.4.18](https://help.github.com/enterprise-server@3.4/admin/release-notes#3.4.18), +[3.8.0](https://help.github.com/enterprise-server@3.8/admin/release-notes#3.8.0), +[3.7.7](https://help.github.com/enterprise-server@3.7/admin/release-notes#3.7.7), +[3.6.10](https://help.github.com/enterprise-server@3.6/admin/release-notes#3.6.10), +[3.5.14](https://help.github.com/enterprise-server@3.5/admin/release-notes#3.5.14), +[3.4.17](https://help.github.com/enterprise-server@3.4/admin/release-notes#3.4.17) ++ GitLab [15.10](https://about.gitlab.com/releases/2023/03/22/gitlab-15-10-released/) +[15.9.3](https://about.gitlab.com/releases/2023/03/09/gitlab-15-9-3-released/), +[15.9.2, 15.8.4, and 15.7.8](https://about.gitlab.com/releases/2023/03/02/security-release-gitlab-15-9-2-released/) ++ Gerrit Code Review [3.7.2](https://www.gerritcodereview.com/3.7.html#372) ++ GitKraken [9.2.1](https://help.gitkraken.com/gitkraken-client/current/), +[9.2.0](https://help.gitkraken.com/gitkraken-client/current/) ++ GitHub Desktop [3.2.0](https://desktop.github.com/release-notes/) ++ Sourcetree [4.2.2](https://product-downloads.atlassian.com/software/sourcetree/ReleaseNotes/Sourcetree_4.2.2.html) + Tower for Windows [4.3](https://www.git-tower.com/release-notes/windows?show_tab=release-notes) ## Other News From c07305ceee5f4b68b4734e04b78facee986c24a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Nar=C4=99bski?= Date: Wed, 29 Mar 2023 23:29:48 +0200 Subject: [PATCH 005/756] rn-97: Add links to various news, articles, sites, and tools --- rev_news/drafts/edition-97.md | 93 +++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/rev_news/drafts/edition-97.md b/rev_news/drafts/edition-97.md index 6489025231..5cba7f3a8b 100644 --- a/rev_news/drafts/edition-97.md +++ b/rev_news/drafts/edition-97.md @@ -57,6 +57,7 @@ This edition covers what happened during the months of February 2023 and March 2 + GitLab [15.10](https://about.gitlab.com/releases/2023/03/22/gitlab-15-10-released/) [15.9.3](https://about.gitlab.com/releases/2023/03/09/gitlab-15-9-3-released/), [15.9.2, 15.8.4, and 15.7.8](https://about.gitlab.com/releases/2023/03/02/security-release-gitlab-15-9-2-released/) ++ Gitea [1.19.0](https://blog.gitea.io/2023/03/gitea-1.19.0-is-released/) + Gerrit Code Review [3.7.2](https://www.gerritcodereview.com/3.7.html#372) + GitKraken [9.2.1](https://help.gitkraken.com/gitkraken-client/current/), [9.2.0](https://help.gitkraken.com/gitkraken-client/current/) @@ -68,11 +69,57 @@ This edition covers what happened during the months of February 2023 and March 2 __Various__ ++ [Highlights from Git 2.40](https://github.blog/2023-03-13-highlights-from-git-2-40/) + by Taylor Blau on GitHub Blog. ++ [public-inbox.org/git to be downgraded](https://public-inbox.org/git/20230313225507.M626677@dcvr/T/) + to a cheaper VPS. + + There is https://lore.kernel.org/git/ if there are problems with public-inbox\.org instance. ++ [Unleash your potential with GitHub Octernships: a path to a thriving tech career](https://github.blog/2023-03-06-unleash-your-potential-with-github-octernships-a-path-to-a-thriving-tech-career/) + by Arkodyuti Saha on GitHub Blog. __Light reading__ + [How to Improve Performance in Git: The Complete Guide](https://www.git-tower.com/blog/git-performance/) by Bruno Brito on Tower’s blog. + [Integrating 1Password SSH with Git (and Tower!)](https://www.git-tower.com/blog/1password-ssh-tower/) by Bruno Brito on Tower’s blog. ++ [Slice, Dice, and Squash Your Git Commit History](https://webdeveloperdiary.substack.com/p/slice-dice-and-squash-your-git-commit) + by Anthony Fung on _Diary of a Web Developer_ Substack and + [on DEV.to](https://dev.to/ant_f_dev/slice-dice-and-squash-your-git-commit-history-2dk3) + is 3rd part in [The Secret of Tidy Git Repositories Series](https://dev.to/ant_f_dev/series/22124). ++ [Git fundamentals, a complete guide](https://dev.to/leandronsp/git-fundamentals-a-complete-guide-do7) + by Leandro Proença on DEV\.to.
+ See also: + + [Git from the Bottom Up](https://jwiegley.github.io/git-from-the-bottom-up/) by John Wiegley, + mentioned in [Git Rev News Edition #2](https://git.github.io/rev_news/2015/04/05/edition-2/), + + [Git for Computer Scientists](https://eagain.net/articles/git-for-computer-scientists/) by Tommi Virtanen, + + and maybe also [Think Like (a) Git: a guide for the perplexed](https://think-like-a-git.net/) by Sam Livingston-Gray. ++ [Options to close pull requests on GitHub](https://dev.to/zdybit/3-options-to-close-pull-requests-on-github-what-2j3n) and + [Merge, squash & rebase on GitHub - pros & cons](https://dev.to/zdybit/when-to-use-particular-options-to-close-pull-requests-on-github-3ce8) + by Kacper Rychel on DEV\.to. ++ [How to Reset a File or Commit in Git](https://www.freecodecamp.org/news/git-revert-how-to-reset-a-file-or-commit/) + by Ihechikara Vincent Abba on freeCodeCamp. ++ [How atomic Git commits dramatically increased my productivity - and will increase yours too](https://dev.to/samuelfaure/how-atomic-git-commits-dramatically-increased-my-productivity-and-will-increase-yours-too-4a84) + by Samuel Faure on DEV\.to and [on Such Dev Blog](https://suchdevblog.com/lessons/AtomicGitCommits.html). ++ [Working with Git in JetBrains' Rider IDE](https://andrewlock.net/working-with-git-in-jetbrains-rider/) + by Andrew Lock on his .NET Escapades blog. ++ [GitHub Desktop 3.2 adds pull request preview – but is a GUI needed for Git?](https://devclass.com/2023/03/06/github-desktop-3-2-adds-pull-request-preview-but-is-a-gui-needed-for-git/) + by Tim Anderson on Dev Class. ++ [Best 8 Data Version Control Tools for Machine Learning 2023](https://dagshub.com/blog/best-data-version-control-tools/) + by Zoumana Keita on DagsHub Blog. + + See also links about data versioning + in [previous Git Rev News](https://git.github.io/rev_news/2023/02/28/edition-96/). ++ [A better git workflow?](https://discourse.julialang.org/t/a-better-git-workflow/95248) + proposal by uje on Julia Language Discourse forum. ++ [Code Commit Guidelines using Conventional Commits](https://proandroiddev.com/code-commit-guidelines-using-conventional-commits-379321ce3785) + by Pragnesh Ghoda on ProAndroidDev, a Medium blog. + 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/). + + ++ [Empowering weak primitives: file truncation to code execution with Git](https://www.sonarsource.com/blog/empowering-weak-primitives-file-truncation-to-code-execution-with-git/) + by Thomas Chauchefoin on Sonar(Source) Blog + (note that it is not about vulnerability in Git).
+ References [Securing Developer Tools: Git Integrations](https://www.sonarsource.com/blog/securing-developer-tools-git-integrations/) + blog post. - + +* [bug report: symbolic-ref --short command echos the wrong text while use Chinese language](https://lore.kernel.org/git/CAGF3oAcCi+fG12j-1U0hcrWwkF5K_9WhOi6ZPHBzUUzfkrZDxA@mail.gmail.com/) + + Mengzi Yi (孟子易) sent a bug report to the mailing list saying that + when a Chinese name like 测试-加-增加-加-增加 was given to a branch, + then using `git symbolic-ref --short HEAD` on that branch didn't + give the right output (for example 测试-� instead of maybe 测试-加). + + Peff, alias Jeff King, replied saying that he couldn't reproduce the + issue on Linux and wondered if it was related to using MacOS as its + HFS+ filesystem might do some unicode normalization. He said that it + might alternatively be related to the shortening code in + `shorten_unambiguous_ref()` treating the names as bytes instead of + characters. Another possibility he mentioned was that the shortening + code, which used `scanf()`, was assuming that the resulting string + could not be longer than the input, but that this might be wrong + when some unicode normalization and locale are used. + + Eric Sunshine replied to Peff saying he was able to reproduce the + bug on MacOS 10.13 (while Mengzi used MacOS 13.2), but that it + didn't appear to be related to HFS+ unicode normalization as the on + disk bytes of the branch name he got were the same as what Peff got + on Linux. + + Peff replied to Eric asking if he could test a patch that would add + debug output and allocate twice as much memory for the shortened + name that would store the output from `scanf()` than for the input + of that function. Peff said the debug output on his Linux machine + showed that the input was 39 bytes long while the output was 28. + + Eric tested Peff's patch and initially reported 39 and 9 for the + input and output respectively. When setting `LANG=zh-CN.UTF-8`, he + got the same input and output lengths as Peff though, which pointed + to `scanf()` being indeed the culprit. + + Junio Hamano, the Git maintainer, replied to Eric's findings saying + "Well, that's ... criminal." and wondering if setting `LANG` to + `$ANY_VALID_ONE.UTF-8` would work the same way. + + This made Eric realize that the `zh-CN` language code he used was + invalid (it should have been `zh_CN`, so with an underscore + character instead of a dash). Eric anyway found out that using valid + LANG codes like `en_US`, `fr_FR`, `de_DE`, `ru_RU` and `zh_CN` gave + the 测试-? truncated output, while using `LANG=C` gave the correct + 测试-加-增加-加-增加 output. + + Junio, Peff and Eric discussed these results further wondering what + `scanf()` on MacOS could be doing wrong. Then Peff suggested + replacing the call to this function with some manual parsing, and + sent a sample in-email patch to do that. + + Eric tested Peff's patch and reported that it looked correct, worked + nicely and fixed the issue. He also agreed with the approach of + getting rid of `scanf()` calls in general. + + Peff then sent + [a regular small patch series](https://lore.kernel.org/git/Y+vVFFCRem6t4IGM@coredump.intra.peff.net/) + based on his previous patch which fixed a leak and made the changes + easier to follow. + + Juni and Eric reviewed the series and then discussed with Peff a bug + Junio found in it. Then Peff sent + [a version 2](https://lore.kernel.org/git/Y+z3MtgayoXsxaHA@coredump.intra.peff.net/) + of the patch series that fixed the bug and added tests. + + Torsten Bögershausen in the meantime tried to reproduce the original + bug and discussed how to do that with Eric. He also commented on the + new tests in the version 2 of the patch series as he found that it + wasn't clear in which context the bug could appear. Junio suggested + some clarifications that were approved by others. The resulting + patches were merged and included in the recent Git v2.40.0 release. + [Empowering weak primitives: file truncation to code execution with Git](https://www.sonarsource.com/blog/empowering-weak-primitives-file-truncation-to-code-execution-with-git/) by Thomas Chauchefoin on Sonar(Source) Blog - (note that it is not about vulnerability in Git).
- References [Securing Developer Tools: Git Integrations](https://www.sonarsource.com/blog/securing-developer-tools-git-integrations/) + (note that it is not about a vulnerability in Git).
+ References the [Securing Developer Tools: Git Integrations](https://www.sonarsource.com/blog/securing-developer-tools-git-integrations/) blog post. + [What the ML is up with DevSecOps and AI?](https://about.gitlab.com/blog/2023/03/16/what-the-ml-ai/) by Taylor McCaslin on GitLab Blog. @@ -205,43 +205,42 @@ __Git tools and sites__ accepting it, especially for more complex changes. Those tools, as far as I understand it, do not take information from an issue tracker, or from code review comments attached to a pull request (or contained in a specialized - tool such as Gerrit) - so they cannot add this information to the proposed - commit message, they can only halucinate it. + tool such as Gerrit) -- so they cannot add this information to the proposed + commit message, they can only halucinate it.
+ All tools listed here require an [API key from OpenAI](https://platform.openai.com/account/api-keys). + [OpenCommit](https://github.com/di-sukharev/opencommit) - is GPT CLI to auto-generate impressive commits in 1 second; - needs API key from [OpenAI](https://platform.openai.com/account/api-keys). - Uses [Conventional Commits](https://www.conventionalcommits.org), - can use [GitMoji](https://gitmoji.dev/). + is a GPT CLI to auto-generate impressive commits in 1 second; + it uses [Conventional Commits](https://www.conventionalcommits.org), + and can use [GitMoji](https://gitmoji.dev/). Written as Node\.js CLI app. + See also [OpenCommit: GPT generates impressive commits in 1 second (open-source)](https://dev.to/disukharev/opencommit-gpt-cli-to-auto-generate-impressive-commits-in-1-second-46dh) by Dima Sukharev on DEV\.to. + [AI Commits](https://github.com/Nutlope/aicommits) - is a CLI app that writes your git commit messages for you with AI, + is a CLI app (`aicommits`) that writes your Git commit messages for you with AI, that can also be used as [`prepare-commit-msg` hook](https://git-scm.com/docs/githooks#_prepare_commit_msg). - Requires [API key from OpenAI](https://platform.openai.com/account/api-keys). Written as Node\.js v14+ CLI app. - + See also [AI generated git commit messages](https://dev.to/bdougieyo/ai-generated-git-commit-messages-4j7g) + + See also [AI generated Git commit messages](https://dev.to/bdougieyo/ai-generated-git-commit-messages-4j7g) by Brian Douglas on DEV\.to. - + [AI-Commit](https://github.com/nguyenvanduocit/ai-commit) + + [`ai-commit`](https://github.com/nguyenvanduocit/ai-commit) is a command line tool that uses [OpenAI](https://openai.com/)'s language generation capabilities to generate [conventional commit](https://www.conventionalcommits.org) messages for your Git repositories. Written in Go. + [gptcommit](https://github.com/zurawiki/gptcommit) is - a git prepare-commit-msg [hook](https://git-scm.com/docs/githooks) - for authoring commit messages with the [OpenAI](https://openai.com/)'s GPT-3 language model. + a Git `prepare-commit-msg` [hook](https://git-scm.com/docs/githooks) + for authoring commit messages with [OpenAI](https://openai.com/)'s GPT-3 language model. Written in Rust. + Mentioned in [Git Rev News Edition #95](https://git.github.io/rev_news/2023/01/31/edition-95/); see also [an article](https://zura.wiki/post/never-write-a-commit-message-again-with-the-help-of-gpt-3/) about this tool there. + [Planar](https://www.useplanar.com/) is a Chrome extension - that adds features used internally by big tech to GitHub code review. + that adds features used internally by big tech to speed up and simplify GitHub code review. + See also [Planar - Add 10x features to GitHub code review](https://www.ycombinator.com/launches/ICU-planar-add-10x-features-to-github-code-review) by Eshan Agarwal on Y Combinator (Launch YC). + [Git for Computer Scientists](https://eagain.net/articles/git-for-computer-scientists/) - by Tommi Virtanen is a quick introduction to git internals for people - who are not scared by words like Directed Acyclic Graph. + by Tommi Virtanen is a quick introduction to Git internals for people + who are not scared by words like directed acyclic graph. + [Think Like (a) Git: a guide for the perplexed](https://think-like-a-git.net/) by Sam Livingston-Gray, intended for "advanced beginners" with Git to help them achieve some level of _Git enlightenment_. From 76a0e354bd882dad3b97fdea1a01c3e499552ff8 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sat, 1 Apr 2023 16:27:29 +0200 Subject: [PATCH 011/756] rn-97: revert 'uses' back to 'used' in main article --- rev_news/drafts/edition-97.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-97.md b/rev_news/drafts/edition-97.md index 374efaaad4..6d77427a1b 100644 --- a/rev_news/drafts/edition-97.md +++ b/rev_news/drafts/edition-97.md @@ -40,7 +40,7 @@ This edition covers what happened during the months of February 2023 and March 2 might alternatively be related to the shortening code in `shorten_unambiguous_ref()` treating the names as bytes instead of characters. Another possibility he mentioned was that the shortening - code, which uses `scanf()`, was assuming that the resulting string + code, which used `scanf()`, was assuming that the resulting string could not be longer than the input, but that this might be wrong when some Unicode normalization and locale were used. From 5b88b3594ff0b74e3537f38781168488059bcb2a Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sat, 1 Apr 2023 16:31:50 +0200 Subject: [PATCH 012/756] Publish rn-97 in _posts/ --- .../drafts/edition-97.md => _posts/2023-03-31-edition-97.markdown | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename rev_news/drafts/edition-97.md => _posts/2023-03-31-edition-97.markdown (100%) diff --git a/rev_news/drafts/edition-97.md b/_posts/2023-03-31-edition-97.markdown similarity index 100% rename from rev_news/drafts/edition-97.md rename to _posts/2023-03-31-edition-97.markdown From 308304bb41cf5f969c9cf1722dfb5e9637e608ca Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sat, 1 Apr 2023 16:31:50 +0200 Subject: [PATCH 013/756] Add draft for rn-98 --- rev_news/drafts/edition-98.md | 60 +++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 rev_news/drafts/edition-98.md diff --git a/rev_news/drafts/edition-98.md b/rev_news/drafts/edition-98.md new file mode 100644 index 0000000000..9e6c2b0441 --- /dev/null +++ b/rev_news/drafts/edition-98.md @@ -0,0 +1,60 @@ +--- +title: Git Rev News Edition 98 (April 26th, 2023) +layout: default +date: 2023-04-26 12:06:51 +0100 +author: chriscool +categories: [news] +navbar: false +--- + +## Git Rev News: Edition 98 (April 26th, 2023) + +Welcome to the 98th 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 2023 and April 2023. + +## Discussions + + + + + + + + + +## Releases + + +## Other News + +__Various__ + + +__Light reading__ + + + +__Git tools and sites__ + + +## 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 06f0dc16420c76d022c7f01ccaa96df4583b2758 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sat, 1 Apr 2023 16:44:42 +0200 Subject: [PATCH 014/756] rn-97: add notes from the libification eng discussion --- _posts/2023-03-31-edition-97.markdown | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/_posts/2023-03-31-edition-97.markdown b/_posts/2023-03-31-edition-97.markdown index 6d77427a1b..a949952ed9 100644 --- a/_posts/2023-03-31-edition-97.markdown +++ b/_posts/2023-03-31-edition-97.markdown @@ -147,6 +147,10 @@ __Various__ by Arkodyuti Saha on GitHub Blog. + [Future-proofing Git repository maintenance](https://about.gitlab.com/blog/2023/03/20/scaling-repository-maintenance/) by Patrick Steinhardt on GitLab blog. ++ [Notes from a video conference](https://lore.kernel.org/git/CAJoAoZm7147oH9ECr=y+OXonK5WSgc9H0b95sF7BhKjMn+oMZg@mail.gmail.com/) + on Thursday March 30 named + [libification eng discussion](https://lore.kernel.org/git/CAJoAoZ=KrnAWV3PpfBkYNs_KHFP5O2dVYOWY3jF=CM9+d89Dpg@mail.gmail.com/) + organized by Emily Shaffer are available. __Light reading__ From 051a8eeb30d4a8508a3539df1ec82750c1f8c3f1 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sat, 1 Apr 2023 17:01:24 +0200 Subject: [PATCH 015/756] rn-97: change publication date to March 31st --- _posts/2023-03-31-edition-97.markdown | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_posts/2023-03-31-edition-97.markdown b/_posts/2023-03-31-edition-97.markdown index a949952ed9..a0e2fa3223 100644 --- a/_posts/2023-03-31-edition-97.markdown +++ b/_posts/2023-03-31-edition-97.markdown @@ -1,13 +1,13 @@ --- -title: Git Rev News Edition 97 (March 29th, 2023) +title: Git Rev News Edition 97 (March 31st, 2023) layout: default -date: 2023-03-29 12:06:51 +0100 +date: 2023-03-31 12:06:51 +0100 author: chriscool categories: [news] navbar: false --- -## Git Rev News: Edition 97 (March 29th, 2023) +## Git Rev News: Edition 97 (March 31st, 2023) Welcome to the 97th 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 From 2e99706a2e273a99b4ceb41aa918bb5d926d3edb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Nar=C4=99bski?= Date: Sat, 1 Apr 2023 17:42:41 +0200 Subject: [PATCH 016/756] rn-97: Typo fix in link description --- _posts/2023-03-31-edition-97.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/2023-03-31-edition-97.markdown b/_posts/2023-03-31-edition-97.markdown index a0e2fa3223..2c21ce5a07 100644 --- a/_posts/2023-03-31-edition-97.markdown +++ b/_posts/2023-03-31-edition-97.markdown @@ -159,7 +159,7 @@ __Light reading__ + [Slice, Dice, and Squash Your Git Commit History](https://webdeveloperdiary.substack.com/p/slice-dice-and-squash-your-git-commit) by Anthony Fung on _Diary of a Web Developer_ Substack and [on DEV.to](https://dev.to/ant_f_dev/slice-dice-and-squash-your-git-commit-history-2dk3) - in part 3 of [The Secret of Tidy Git Repositories Series](https://dev.to/ant_f_dev/series/22124). + is 3rd part of [The Secret of Tidy Git Repositories Series](https://dev.to/ant_f_dev/series/22124). + [Git fundamentals, a complete guide](https://dev.to/leandronsp/git-fundamentals-a-complete-guide-do7) by Leandro Proença on DEV\.to.
See also: From 81821b7f034470295e026d71173c4004378864b2 Mon Sep 17 00:00:00 2001 From: Markus Jansen Date: Tue, 4 Apr 2023 09:24:53 +0200 Subject: [PATCH 017/756] Last fixes before sending the email. --- _posts/2023-03-31-edition-97.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_posts/2023-03-31-edition-97.markdown b/_posts/2023-03-31-edition-97.markdown index 2c21ce5a07..892c4a56e1 100644 --- a/_posts/2023-03-31-edition-97.markdown +++ b/_posts/2023-03-31-edition-97.markdown @@ -159,7 +159,7 @@ __Light reading__ + [Slice, Dice, and Squash Your Git Commit History](https://webdeveloperdiary.substack.com/p/slice-dice-and-squash-your-git-commit) by Anthony Fung on _Diary of a Web Developer_ Substack and [on DEV.to](https://dev.to/ant_f_dev/slice-dice-and-squash-your-git-commit-history-2dk3) - is 3rd part of [The Secret of Tidy Git Repositories Series](https://dev.to/ant_f_dev/series/22124). + as 3rd part of [The Secret of Tidy Git Repositories Series](https://dev.to/ant_f_dev/series/22124). + [Git fundamentals, a complete guide](https://dev.to/leandronsp/git-fundamentals-a-complete-guide-do7) by Leandro Proença on DEV\.to.
See also: @@ -206,7 +206,7 @@ __Git tools and sites__ + There are a few tools that use GPT-3 / ChatGPT Large Language Model (LLM) to help write commit messages. Please read the proposed commit message before - accepting it, especially for more complex changes. Those tools, as far as I + accepting it, especially for more complex changes. Those tools, as far as we understand it, do not take information from an issue tracker, or from code review comments attached to a pull request (or contained in a specialized tool such as Gerrit) -- so they cannot add this information to the proposed From 78bb7e3b31030bef274568b9cac475a400e179b5 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Tue, 11 Apr 2023 14:32:01 +0200 Subject: [PATCH 018/756] Hacking-Git: add gdb test debugging example --- Hacking-Git.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hacking-Git.md b/Hacking-Git.md index d8fe547873..9d20bd5ef5 100644 --- a/Hacking-Git.md +++ b/Hacking-Git.md @@ -108,6 +108,8 @@ suggest improvements. Thanks! * [Philippe Blain's "Debugging Git" Gist](https://gist.github.com/phil-blain/17c67740bd26e66f4851fe0c07230ea4) +* [Debugging test failure using gdb example](https://public-inbox.org/git/CAP8UFD3Bd4Af1XZ00VyuHnQs=MFrdUufKeePO1tyedWoReRjwQ@mail.gmail.com/) + ## Tests * ["`t/README`"](https://github.com/git/git/blob/master/t/README) From c00f67575bd28fd6b72c5e106837d59157654f1e Mon Sep 17 00:00:00 2001 From: Kaartic Sivaraam Date: Mon, 17 Apr 2023 00:35:33 +0530 Subject: [PATCH 019/756] Include development info and re-shuffle home/about pages The information to spin up the site locally got buried inside _includes/README in a recent change. It actually belongs to the README present in the root of the repo, too since that is what users see when viewing the repository. Hence, move that information there. The "About" page has long been very identical to the home page. So, shuffle the content in home and about pages and unify them into the Home page itself. For historical purposes, make the about page redirect to the homepage. Fixes #610 --- Gemfile | 1 + README.md | 19 +++++++++++++ _config.yml | 2 ++ _includes/README.md | 63 +++++++++++++++---------------------------- _includes/navbar.html | 1 - about.html | 7 +++++ about.md | 7 ----- index.md | 22 +-------------- 8 files changed, 52 insertions(+), 70 deletions(-) create mode 100644 about.html delete mode 100644 about.md diff --git a/Gemfile b/Gemfile index 7d8bf5df60..3cc8ef00a1 100644 --- a/Gemfile +++ b/Gemfile @@ -5,3 +5,4 @@ gem 'github-pages', group: :jekyll_plugins # gem "webrick", "~> 1.7" # N.B. we may not want to fix this Gemfile to Ruby 3 gem "webrick" +gem 'jekyll-redirect-from' \ No newline at end of file diff --git a/README.md b/README.md index 1ea95e5396..99d8801805 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,25 @@ - These pages are intended to be edited collaboratively (i.e., it is an alternative to us having a wiki, but one that is edited entirely via Git pushes). + You could also send your changes as patches by email to Christian Couder < > / Kaartic Sivaraam < > (and feel free to cc git@vger.kernel.org if appropriate). + + +### Development + +If you wish to spin up the site locally, you could follow the steps below. + +* Make sure you've got ruby2 with dev-packages installed +* `sudo gem install bundler` +* Clone this repo +* `sudo apt-get install zlib1g-dev` # [ + [ref](http://www.nokogiri.org/tutorials/installing_nokogiri.html#ubuntu___debian) + ] +* `bundle install` +* `bundle exec jekyll serve` +* browse the site on http://localhost:4000 + +Based on https://help.github.com/articles/using-jekyll-with-pages/ +
diff --git a/_config.yml b/_config.yml index 7633f45e70..f3e563f9aa 100644 --- a/_config.yml +++ b/_config.yml @@ -1,2 +1,4 @@ name: Git Developer Pages permalink: /rev_news/:year/:month/:day/:title/ +plugins: + - jekyll-redirect-from \ No newline at end of file diff --git a/_includes/README.md b/_includes/README.md index ea8fb22500..d70f2c116c 100644 --- a/_includes/README.md +++ b/_includes/README.md @@ -1,41 +1,22 @@ -# About Git Developer Pages - -This is a website to help Git Developers. - -It is NOT a place to discuss Git issues. Please see -[git-scm.org's community page](https://git-scm.com/community) -for information about bug reporting or interacting with the -community. - -The pages are maintained by editing files in the -[git/git.github.io](https://github.com/git/git.github.io) repository on -GitHub. It is then published on the -[https://git.github.io](https://git.github.io) GitHub page. - -It is meant to be edited collaboratively like a wiki, except that -instead of a web form, you get to use a text editor and Git. What could -be better? - -These pages also host the [Git Rev News](https://git.github.io/rev_news/), -see the [About Git Rev News](https://git.github.io/rev_news/rev_news/) page. - -If you want push access, contact Christian Couder -< > or Taylor Blau < > and -provide your GitHub username. You may also send patches by mail (and -feel free to cc git@vger.kernel.org if appropriate). - - -# Development - -* Make sure you've got ruby2 with dev-packages installed -* `sudo gem install bundler` -* Clone this repo -* `sudo apt-get install zlib1g-dev` # ref [1] -* `bundle install` -* `bundle exec jekyll serve` -* browse the site on http://localhost:4000 - -Based on https://help.github.com/articles/using-jekyll-with-pages/ - -[1] http://www.nokogiri.org/tutorials/installing_nokogiri.html#ubuntu___debian - +This is a website for information on Git development. If you stumbled into this +by mistake, you may want: + - Information on running Git and links to download the latest version from + [HERE](https://git-scm.com/) + - Wiki that has historically contained developer information from + [HERE](https://git.wiki.kernel.org/index.php/Main_Page) + +These pages are intended to collect information useful to Git developers. This +is also the web home of: + - the [Hacking Git](https://git.github.io/Hacking-Git/) page, + - the [Git Rev News newsletter](https://git.github.io/rev_news/), + - the [involvement of the Git project in mentoring + programs](https://git.github.io/General-Application-Information/) like + [Outreachy](https://www.outreachy.org/) and the [GSoC (Google Summer of + Code)](https://summerofcode.withgoogle.com/) + +These pages are intended to be edited collaboratively (i.e., it is an +alternative to us having a wiki, but one that is edited entirely via Git pushes. +The [repository](https://github.com/git/git.github.io) could be found on GitHub. +You could also send your changes as patches by email to Christian Couder < + > / Kaartic Sivaraam < > +(and feel free to cc git@vger.kernel.org if appropriate). diff --git a/_includes/navbar.html b/_includes/navbar.html index 6d52b36c9f..d4dfe25bda 100644 --- a/_includes/navbar.html +++ b/_includes/navbar.html @@ -1,7 +1,6 @@