[pull] master from git:master

Documentation/RelNotes/2.54.0.adoc

@@ -91,6 +91,12 @@ UI, Workflows & Features
  * "git rebase" learns "--trailer" command to drive the
    interpret-trailers machinery.
 
+ * "git fast-import" learned to optionally replace signature on
+   commits whose signatures get invalidated due to replaying by
+   signing afresh.
+
+ * "git history" learned the "split" subcommand.
+
 
 Performance, Internal Implementation, Development Support etc.
 --------------------------------------------------------------
@@ -212,6 +218,15 @@ Performance, Internal Implementation, Development Support etc.
 
  * Adjust test-lint to allow "sed -E" to use ERE in the patterns.
 
+ * Clar (unit testing framework) update from the upstream.
+
+ * Reduce system overhead "git upload-pack" spends on relaying "git
+   pack-objects" output to the "git fetch" running on the other end of
+   the connection.
+
+ * Add a coccinelle rule to break the build when "struct strbuf" gets
+   passed by value.
+
 
 Fixes since v2.53
 -----------------
@@ -358,6 +373,17 @@ Fixes since v2.53
    available since OpenSSL 1.1 since 2016 or so.
    (merge 6392a0b75d bb/imap-send-openssl-4.0-prep later to maint).
 
+ * Fix an example in the user-manual.
+   (merge 5514f14617 gj/user-manual-fix-grep-example later to maint).
+
+ * The final clean-up phase of the diff output could turn the result of
+   histogram diff algorithm suboptimal, which has been corrected.
+   (merge e417277ae9 yc/histogram-hunk-shift-fix later to maint).
+
+ * "git diff -U<num>" was too lenient in its command line parsing and
+   took an empty string as a valid <num>.
+   (merge 4f6a803aba ty/doc-diff-u-wo-number later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge d79fff4a11 jk/remote-tracking-ref-leakfix later to maint).
    (merge 7a747f972d dd/t5403-modernise later to maint).
@@ -401,3 +427,7 @@ Fixes since v2.53
    (merge 35f220b639 ss/submodule--helper-use-xmalloc later to maint).
    (merge 02cbae61df cf/constness-fixes later to maint).
    (merge 69efd53c81 ms/t7605-test-path-is-helpers later to maint).
+   (merge d39cef3a1a ss/t0410-delete-object-cleanup later to maint).
+   (merge 2f05039717 rj/pack-refs-tests-path-is-helpers later to maint).
+   (merge 2594747ad1 jk/transport-color-leakfix later to maint).
+   (merge 48430e44ac mf/t0008-cleanup later to maint).

Documentation/diff-context-options.adoc

@@ -1,7 +1,9 @@
 `-U<n>`::
 `--unified=<n>`::
-	Generate diffs with _<n>_ lines of context. Defaults to `diff.context`
-	or 3 if the config option is unset.
+	Generate diffs with _<n>_ lines of context. The number of context
+	lines defaults to `diff.context` or 3 if the configuration variable
+	is unset. (`-U` without `<n>` is silently accepted as a synonym for
+	`-p` due to a historical accident).
 
 `--inter-hunk-context=<n>`::
 	Show the context between diff hunks, up to the specified _<number>_

Documentation/diff-options.adoc

@@ -127,8 +127,10 @@ endif::git-log[]
 
 `-U<n>`::
 `--unified=<n>`::
-	Generate diffs with _<n>_ lines of context instead of
-	the usual three.
+	Generate diffs with _<n>_ lines of context. The number of context
+	lines defaults to `diff.context` or 3 if the configuration variable
+	is unset. (`-U` without `<n>` is silently accepted as a synonym for
+	`-p` due to a historical accident).
 ifndef::git-format-patch[]
 	Implies `--patch`.
 endif::git-format-patch[]

Documentation/git-fast-import.adoc

@@ -86,6 +86,10 @@ already trusted to run their own code.
 * `strip-if-invalid` will check signatures and, if they are invalid,
   will strip them and display a warning. The validation is performed
   in the same way as linkgit:git-verify-commit[1] does it.
+* `sign-if-invalid[=<keyid>]`, similar to `strip-if-invalid`, verifies
+  commit signatures and replaces invalid signatures with newly created ones.
+  Valid signatures are left unchanged. If `<keyid>` is provided, that key is
+  used for signing; otherwise the configured default signing key is used.
 
 Options for Frontends
 ~~~~~~~~~~~~~~~~~~~~~

Documentation/git-history.adoc

@@ -9,6 +9,7 @@ SYNOPSIS
 --------
 [synopsis]
 git history reword <commit> [--dry-run] [--update-refs=(branches|head)]
+git history split <commit> [--dry-run] [--update-refs=(branches|head)] [--] [<pathspec>...]
 
 DESCRIPTION
 -----------
@@ -57,6 +58,26 @@ The following commands are available to rewrite history in different ways:
 	details of this commit remain unchanged. This command will spawn an
 	editor with the current message of that commit.
 
+`split <commit> [--] [<pathspec>...]`::
+	Interactively split up <commit> into two commits by choosing
+	hunks introduced by it that will be moved into the new split-out
+	commit. These hunks will then be written into a new commit that
+	becomes the parent of the previous commit. The original commit
+	stays intact, except that its parent will be the newly split-out
+	commit.
++
+The commit messages of the split-up commits will be asked for by launching
+the configured editor. Authorship of the commit will be the same as for the
+original commit.
++
+If passed, _<pathspec>_ can be used to limit which changes shall be split out
+of the original commit. Files not matching any of the pathspecs will remain
+part of the original commit. For more details, see the 'pathspec' entry in
+linkgit:gitglossary[7].
++
+It is invalid to select either all or no hunks, as that would lead to
+one of the commits becoming empty.
+
 OPTIONS
 -------
 
@@ -72,6 +93,47 @@ OPTIONS
 	descendants of the original commit will be rewritten. With `head`, only
 	the current `HEAD` reference will be rewritten. Defaults to `branches`.
 
+EXAMPLES
+--------
+
+Split a commit
+~~~~~~~~~~~~~~
+
+----------
+$ git log --stat --oneline
+3f81232 (HEAD -> main) original
+ bar | 1 +
+ foo | 1 +
+ 2 files changed, 2 insertions(+)
+
+$ git history split HEAD
+diff --git a/bar b/bar
+new file mode 100644
+index 0000000..5716ca5
+--- /dev/null
++++ b/bar
+@@ -0,0 +1 @@
++bar
+(1/1) Stage addition [y,n,q,a,d,p,?]? y
+
+diff --git a/foo b/foo
+new file mode 100644
+index 0000000..257cc56
+--- /dev/null
++++ b/foo
+@@ -0,0 +1 @@
++foo
+(1/1) Stage addition [y,n,q,a,d,p,?]? n
+
+$ git log --stat --oneline
+7cebe64 (HEAD -> main) original
+ foo | 1 +
+ 1 file changed, 1 insertion(+)
+d1582f3 split-out commit
+ bar | 1 +
+ 1 file changed, 1 insertion(+)
+----------
+
 GIT
 ---
 Part of the linkgit:git[1] suite

Documentation/user-manual.adoc

@@ -4466,7 +4466,7 @@ $ git show		    # most recent commit
 $ git diff v2.6.15..v2.6.16 # diff between two tagged versions
 $ git diff v2.6.15..HEAD    # diff with current head
 $ git grep "foo()"	    # search working directory for "foo()"
-$ git grep v2.6.15 "foo()"  # search old tree for "foo()"
+$ git grep "foo()" v2.6.15  # search old tree for "foo()"
 $ git show v2.6.15:a.txt    # look at old version of a.txt
 -----------------------------------------------
 

Makefile

@@ -2027,6 +2027,10 @@ ifdef NO_PREAD
 	COMPAT_CFLAGS += -DNO_PREAD
 	COMPAT_OBJS += compat/pread.o
 endif
+ifdef NO_WRITEV
+	COMPAT_CFLAGS += -DNO_WRITEV
+	COMPAT_OBJS += compat/writev.o
+endif
 ifdef NO_FAST_WORKING_DIRECTORY
 	BASIC_CFLAGS += -DNO_FAST_WORKING_DIRECTORY
 endif