rebase

.cirrus.yml

@@ -19,4 +19,4 @@ freebsd_12_task:
   build_script:
     - su git -c gmake
   test_script:
-    - su git -c 'gmake DEFAULT_UNIT_TEST_TARGET=unit-tests-prove test unit-tests'
+    - su git -c 'gmake test'

.github/workflows/main.yml

@@ -309,17 +309,6 @@ jobs:
       with:
         name: failed-tests-${{matrix.vector.jobname}}
         path: ${{env.FAILED_TEST_ARTIFACTS}}
-  fuzz-smoke-test:
-    name: fuzz smoke test
-    needs: ci-config
-    if: needs.ci-config.outputs.enabled == 'yes'
-    env:
-      CC: clang
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - run: ci/install-dependencies.sh
-    - run: ci/run-build-and-minimal-fuzzers.sh
   dockerized:
     name: ${{matrix.vector.jobname}} (${{matrix.vector.image}})
     needs: ci-config

.gitignore

@@ -135,7 +135,6 @@
 /git-remote-ext
 /git-repack
 /git-replace
-/git-replay
 /git-request-pull
 /git-rerere
 /git-reset

.pc/.quilt_patches

@@ -0,0 +1 @@
+debian/patches

.pc/.quilt_series

@@ -0,0 +1 @@
+series

.pc/.version

@@ -0,0 +1 @@
+2

CODE_OF_CONDUCT.md

@@ -130,11 +130,11 @@ This Code of Conduct is adapted from the [Contributor Covenant][homepage],
 version 2.0, available at
 [https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0].
 
-Community Impact Guidelines were inspired by
+Community Impact Guidelines were inspired by 
 [Mozilla's code of conduct enforcement ladder][Mozilla CoC].
 
 For answers to common questions about this code of conduct, see the FAQ at
-[https://www.contributor-covenant.org/faq][FAQ]. Translations are available
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available 
 at [https://www.contributor-covenant.org/translations][translations].
 
 [homepage]: https://www.contributor-covenant.org

Documentation/CodingGuidelines

@@ -450,7 +450,7 @@ For C programs:
    one of the approved headers that includes it first for you.  (The
    approved headers currently include "builtin.h",
    "t/helper/test-tool.h", "xdiff/xinclude.h", or
-   "reftable/system.h".)  You do not have to include more than one of
+   "reftable/system.h").  You do not have to include more than one of
    these.
 
  - A C file must directly include the header files that declare the
@@ -490,7 +490,7 @@ For Perl programs:
 
  - Most of the C guidelines above apply.
 
- - We try to support Perl 5.8.1 and later ("use Perl 5.008001").
+ - We try to support Perl 5.8 and later ("use Perl 5.008").
 
  - use strict and use warnings are strongly preferred.
 
@@ -518,7 +518,7 @@ For Perl programs:
 
 For Python scripts:
 
- - We follow PEP-8 (https://peps.python.org/pep-0008/).
+ - We follow PEP-8 (http://www.python.org/dev/peps/pep-0008/).
 
  - As a minimum, we aim to be compatible with Python 2.7.
 
@@ -578,7 +578,7 @@ Externally Visible Names
    . The variable name describes the effect of tweaking this knob.
 
    The section and variable names that consist of multiple words are
-   formed by concatenating the words without punctuation marks (e.g. `-`),
+   formed by concatenating the words without punctuations (e.g. `-`),
    and are broken using bumpyCaps in documentation as a hint to the
    reader.
 

Documentation/Makefile

@@ -122,7 +122,6 @@ TECH_DOCS += technical/scalar
 TECH_DOCS += technical/send-pack-pipeline
 TECH_DOCS += technical/shallow
 TECH_DOCS += technical/trivial-merge
-TECH_DOCS += technical/unit-tests
 SP_ARTICLES += $(TECH_DOCS)
 SP_ARTICLES += technical/api-index
 

Documentation/MyFirstContribution.txt

@@ -35,9 +35,8 @@ announcements, design discussions, and more take place. Those interested in
 contributing are welcome to post questions here. The Git list requires
 plain-text-only emails and prefers inline and bottom-posting when replying to
 mail; you will be CC'd in all replies to you. Optionally, you can subscribe to
-the list by sending an email to <git+subscribe@vger.kernel.org>
-(see https://subspace.kernel.org/subscribing.html for details).
-The https://lore.kernel.org/git[archive] of this mailing list is
+the list by sending an email to majordomo@vger.kernel.org with "subscribe git"
+in the body. The https://lore.kernel.org/git[archive] of this mailing list is
 available to view in a browser.
 
 ==== https://groups.google.com/forum/#!forum/git-mentoring[git-mentoring@googlegroups.com]
@@ -834,7 +833,7 @@ Johannes Schindelin to make life as a Git contributor easier for those used to
 the GitHub PR workflow. It allows contributors to open pull requests against its
 mirror of the Git project, and does some magic to turn the PR into a set of
 emails and send them out for you. It also runs the Git continuous integration
-suite for you. It's documented at https://gitgitgadget.github.io/.
+suite for you. It's documented at http://gitgitgadget.github.io.
 
 [[create-fork]]
 === Forking `git/git` on GitHub

Documentation/RelNotes/1.6.2.txt

@@ -10,7 +10,7 @@ To ease the transition plan, the receiving repository of such a
 push running this release will issue a big warning when the
 configuration variable is missing.  Please refer to:
 
-  https://archive.kernel.org/oldwiki/git.wiki.kernel.org/index.php/GitFaq.html#non-bare
+  http://git.or.cz/gitwiki/GitFaq#non-bare
   https://lore.kernel.org/git/7vbptlsuyv.fsf@gitster.siamese.dyndns.org/
 
 for more details on the reason why this change is needed and the

Documentation/RelNotes/1.6.3.txt

@@ -10,7 +10,7 @@ To ease the transition plan, the receiving repository of such a
 push running this release will issue a big warning when the
 configuration variable is missing.  Please refer to:
 
-  https://archive.kernel.org/oldwiki/git.wiki.kernel.org/index.php/GitFaq.html#non-bare
+  http://git.or.cz/gitwiki/GitFaq#non-bare
   https://lore.kernel.org/git/7vbptlsuyv.fsf@gitster.siamese.dyndns.org/
 
 for more details on the reason why this change is needed and the

Documentation/RelNotes/1.6.4.txt

@@ -10,7 +10,7 @@ To ease the transition plan, the receiving repository of such a
 push running this release will issue a big warning when the
 configuration variable is missing.  Please refer to:
 
-  https://archive.kernel.org/oldwiki/git.wiki.kernel.org/index.php/GitFaq.html#non-bare
+  http://git.or.cz/gitwiki/GitFaq#non-bare
   https://lore.kernel.org/git/7vbptlsuyv.fsf@gitster.siamese.dyndns.org/
 
 for more details on the reason why this change is needed and the

Documentation/RelNotes/1.6.5.txt

@@ -21,7 +21,7 @@ To ease the transition plan, the receiving repository of such a
 push running this release will issue a big warning when the
 configuration variable is missing.  Please refer to:
 
-  https://archive.kernel.org/oldwiki/git.wiki.kernel.org/index.php/GitFaq.html#non-bare
+  http://git.or.cz/gitwiki/GitFaq#non-bare
   https://lore.kernel.org/git/7vbptlsuyv.fsf@gitster.siamese.dyndns.org/
 
 for more details on the reason why this change is needed and the

Documentation/RelNotes/1.6.6.txt

@@ -63,7 +63,7 @@ users will fare this time.
 
    Please refer to:
 
-   https://archive.kernel.org/oldwiki/git.wiki.kernel.org/index.php/GitFaq.html#non-bare
+   http://git.or.cz/gitwiki/GitFaq#non-bare
    https://lore.kernel.org/git/7vbptlsuyv.fsf@gitster.siamese.dyndns.org/
 
    for more details on the reason why this change is needed and the

Documentation/SubmittingPatches

@@ -355,21 +355,9 @@ If you like, you can put extra tags at the end:
   patch after a detailed analysis.
 . `Tested-by:` is used to indicate that the person applied the patch
   and found it to have the desired effect.
-. `Co-authored-by:` is used to indicate that people exchanged drafts
-   of a patch before submitting it.
-. `Helped-by:` is used to credit someone who suggested ideas for
-  changes without providing the precise changes in patch form.
-. `Mentored-by:` is used to credit someone with helping develop a
-  patch as part of a mentorship program (e.g., GSoC or Outreachy).
-. `Suggested-by:` is used to credit someone with suggesting the idea
-  for a patch.
-
-While you can also create your own trailer if the situation warrants it, we
-encourage you to instead use one of the common trailers in this project
-highlighted above.
-
-Only capitalize the very first letter of tags, i.e. favor
-"Signed-off-by" over "Signed-Off-By" and "Acked-by:" over "Acked-By".
+
+You can also create your own tag or use one that's in common usage
+such as "Thanks-to:", "Based-on-patch-by:", or "Mentored-by:".
 
 [[git-tools]]
 === Generate your patch using Git tools out of your commits.
@@ -582,7 +570,7 @@ their trees themselves.
   master).
 
 * Read the Git mailing list, the maintainer regularly posts messages
-  entitled "What's cooking in git.git" giving
+  entitled "What's cooking in git.git" and "What's in git.git" giving
   the status of various proposed changes.
 
 == GitHub CI[[GHCI]]
@@ -602,12 +590,11 @@ After the initial setup, CI will run whenever you push new changes
 to your fork of Git on GitHub.  You can monitor the test state of all your
 branches here: `https://github.com/<Your GitHub handle>/git/actions/workflows/main.yml`
 
-If a branch does not pass all test cases then it will be marked with a
-red +x+, instead of a green check. In that case, you can click on the
-failing job and navigate to "ci/run-build-and-tests.sh" and/or
-"ci/print-test-failures.sh". You can also download "Artifacts" which
-are zip archives containing tarred (or zipped) archives with test data
-relevant for debugging.
+If a branch did not pass all test cases then it is marked with a red
+cross. In that case you can click on the failing job and navigate to
+"ci/run-build-and-tests.sh" and/or "ci/print-test-failures.sh". You
+can also download "Artifacts" which are tarred (or zipped) archives
+with test data relevant for debugging.
 
 Then fix the problem and push your fix to your GitHub fork. This will
 trigger a new CI build to ensure all tests pass.
@@ -699,7 +686,7 @@ message to an external program, and this is a handy way to drive
 `git am`.  However, if the message is MIME encoded, what is
 piped into the program is the representation you see in your
 `*Article*` buffer after unwrapping MIME.  This is often not what
-you would want for two reasons.  It tends to screw up non-ASCII
+you would want for two reasons.  It tends to screw up non ASCII
 characters (most notably in people's names), and also
 whitespaces (fatal in patches).  Running "C-u g" to display the
 message in raw form before using "|" to run the pipe can work