Sync with 'master'

Author: gitster

Documentation/RelNotes/2.46.1.txt

@@ -63,4 +63,13 @@ Fixes since Git 2.46
  * "git bundle unbundle" outside a repository triggered a BUG()
    unnecessarily, which has been corrected.
 
+ * The code forgot to discard unnecessary in-core commit buffer data
+   for commits that "git log --skip=<number>" traversed but omitted
+   from the output, which has been corrected.
+
+ * "git verify-pack" and "git index-pack" started dying outside a
+   repository, which has been corrected.
+
+ * A corner case bug in "git stash" was fixed.
+
 Also contains minor documentation updates and code clean-ups.

Documentation/RelNotes/2.47.0.txt

@@ -59,6 +59,11 @@ UI, Workflows & Features
    added by these helper functions, but many existing messages had an
    unnecessary LF at the end, which have been corrected.
 
+ * The "scalar clone" command learned the "--no-tags" option.
+
+ * The environment GIT_ADVICE has been intentionally kept undocumented
+   to discourage its use by interactive users.  Add documentation to
+   help tool writers.
 
 Performance, Internal Implementation, Development Support etc.
 --------------------------------------------------------------
@@ -157,7 +162,6 @@ Fixes since v2.46
    corrected.
 
  * More leakfixes.
-   (merge f30bfafcd4 ps/leakfixes-part-3 later to maint).
 
  * The credential helper to talk to OSX keychain sometimes sent
    garbage bytes after the username, which has been corrected.
@@ -167,7 +171,6 @@ Fixes since v2.46
 
  * The patch parser in 'git apply' has been a bit more lenient against
    unexpected mode bits, like 100664, recorded on extended header lines.
-   (merge e95d515141 jk/apply-patch-mode-check-fix later to maint).
 
  * "git config --value=foo --fixed-value section.key newvalue" barfed
    when the existing value in the configuration file used the
@@ -176,7 +179,6 @@ Fixes since v2.46
  * The patch parser in "git patch-id" has been tightened to avoid
    getting confused by lines that look like a patch header in the log
    message.
-   (merge a6e9429f72 jc/patch-id later to maint).
 
  * "git reflog expire" failed to honor annotated tags when computing
    reachable commits.
@@ -192,7 +194,6 @@ Fixes since v2.46
 
  * "git bundle unbundle" outside a repository triggered a BUG()
    unnecessarily, which has been corrected.
-   (merge 96a9a3e42e ps/bundle-outside-repo-fix later to maint).
 
  * Maintenance tasks other than "gc" now properly go background when
    "git maintenance" runs them.
@@ -210,11 +211,9 @@ Fixes since v2.46
  * The code forgot to discard unnecessary in-core commit buffer data
    for commits that "git log --skip=<number>" traversed but omitted
    from the output, which has been corrected.
-   (merge 6bd2ae67a5 jk/free-commit-buffer-of-skipped-commits later to maint).
 
  * "git verify-pack" and "git index-pack" started dying outside a
    repository, which has been corrected.
-   (merge b2dbf97f47 ps/index-pack-outside-repo-fix later to maint).
 
  * A data corruption bug when multi-pack-index is used and the same
    objects are stored in multiple packfiles has been corrected.
@@ -223,15 +222,22 @@ Fixes since v2.46
    which has been a bit tamed.
    (merge c3459ae9ef ps/pack-refs-auto-heuristics later to maint).
 
+ * A file descriptor left open is now properly closed when "git
+   sparse-checkout" updates the sparse patterns.
+
+ * In a few corner cases "git diff --exit-code" failed to report
+   "changes" (e.g., renamed without any content change), which has
+   been corrected.
+   (merge 11591850dd rs/diff-exit-code-fix later to maint).
+
+ * Cygwin does have /dev/tty support that is needed by things like
+   single-key input mode.
+   (merge 39ba986b0e rj/cygwin-has-dev-tty later to maint).
+
+ * The interpret-trailers command failed to recognise the end of the
+   message when the commit log ends in an incomplete line.
+   (merge c02414a997 bl/trailers-and-incomplete-last-line-fix later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
-   (merge bb0498b1bb jc/how-to-maintain-updates later to maint).
-   (merge 0d66f601a9 jc/tests-no-useless-tee later to maint).
-   (merge 170cdfc5a4 jc/grammo-fixes later to maint).
-   (merge 983555a1f2 jc/how-to-maintain-updates later to maint).
-   (merge e3209bd4df ps/stash-keep-untrack-empty-fix later to maint).
-   (merge 44db6f75cc jc/coding-style-c-operator-with-spaces later to maint).
-   (merge 596f4ff6ad cl/config-regexp-docfix later to maint).
-   (merge 4881328617 aa/cat-file-batch-output-doc later to maint).
-   (merge 1609470409 jc/config-doc-update later to maint).
-   (merge d4dc0efd7d rj/compat-terminal-unused-fix later to maint).
    (merge be10ac7037 jc/mailinfo-header-cleanup later to maint).
+   (merge 9a36ea37ae jc/doc-skip-fetch-all-and-prefetch later to maint).