Git fork

The fourth batch

Also update the DEF_VER in GIT-VERSION-GEN, which I forgot to do
earlier (it should have been done when we started the new cycle).

Signed-off-by: Junio C Hamano <gitster@pobox.com>

+35 -1
+34
Documentation/RelNotes/2.45.0.txt
··· 17 17 18 18 * "git reflog" learned a "list" subcommand that enumerates known reflogs. 19 19 20 + * When a merge conflicted at a submodule, merge-ort backend used to 21 + unconditionally give a lengthy message to suggest how to resolve 22 + it. Now the message can be squelched as an advice message. 23 + 24 + * "git for-each-ref" learned "--include-root-refs" option to show 25 + even the stuff outside the 'refs/' hierarchy. 26 + 20 27 21 28 Performance, Internal Implementation, Development Support etc. 22 29 ··· 65 72 option; it used to always exit with 0 and signalled success. 66 73 (merge eb84c8b6ce ps/difftool-dir-diff-exit-code later to maint). 67 74 75 + * The code incorrectly attempted to use textconv cache when asked, 76 + even when we are not running in a repository, which has been 77 + corrected. 78 + (merge affe355fe7 jk/textconv-cache-outside-repo-fix later to maint). 79 + 80 + * Remove an empty file that shouldn't have been added in the first 81 + place. 82 + (merge 4f66942215 js/remove-cruft-files later to maint). 83 + 84 + * The logic to access reflog entries by date and number had ugly 85 + corner cases at the boundaries, which have been cleaned up. 86 + (merge 5edd126720 jk/reflog-special-cases-fix later to maint). 87 + 88 + * An error message from "git upload-pack", which responds to "git 89 + fetch" requests, had a trialing NUL in it, which has been 90 + corrected. 91 + (merge 3f4c7a0805 sg/upload-pack-error-message-fix later to maint). 92 + 93 + * Clarify wording in the CodingGuidelines that requires <git-compat-util.h> 94 + to be the first header file. 95 + (merge 4e89f0e07c jc/doc-compat-util later to maint). 96 + 68 97 * Other code cleanup, docfix, build fix, etc. 69 98 (merge f0e578c69c rs/use-xstrncmpz later to maint). 70 99 (merge 83e6eb7d7a ba/credential-test-clean-fix later to maint). ··· 74 103 (merge 41bff66e35 jc/doc-add-placeholder-fix later to maint). 75 104 (merge 6835f0efe9 jw/remote-doc-typofix later to maint). 76 105 (merge 244001aa20 hs/rebase-not-in-progress later to maint). 106 + (merge 2ca6c07db2 jc/no-include-of-compat-util-from-headers later to maint). 107 + (merge 87bd7fbb9c rs/fetch-simplify-with-starts-with later to maint). 108 + (merge f39addd0d9 rs/name-rev-with-mempool later to maint). 109 + (merge 9a97b43e03 rs/submodule-prefix-simplify later to maint). 110 + (merge 40b8076462 ak/rebase-autosquash later to maint).
+1 -1
GIT-VERSION-GEN
··· 1 1 #!/bin/sh 2 2 3 3 GVF=GIT-VERSION-FILE 4 - DEF_VER=v2.44.0 4 + DEF_VER=v2.44.GIT 5 5 6 6 LF=' 7 7 '