git/builtin, branch v2.36.2

Merge branch 'jc/clone-remote-name-leak-fix' into maint

2022-06-08T21:27:53Z

"git clone --origin X" leaked piece of memory that held value read from the clone.defaultRemoteName configuration variable, which has been plugged. source: * jc/clone-remote-name-leak-fix: clone: plug a miniscule leak

Merge branch 'ds/midx-normalize-pathname-before-comparison' into maint

2022-06-08T21:27:53Z

The path taken by "git multi-pack-index" command from the end user was compared with path internally prepared by the tool withut first normalizing, which lead to duplicated paths not being noticed, which has been corrected. source: * ds/midx-normalize-pathname-before-comparison: cache: use const char * for get_object_directory() multi-pack-index: use --object-dir real path midx: use real paths in lookup_multi_pack_index()

Merge branch 'ah/rebase-keep-base-fix' into maint

2022-06-08T21:27:52Z

"git rebase --keep-base

" computed the commit to rebase onto incorrectly, which has been corrected. source: <20220421044233.894255-1-alexhenrie24@gmail.com> * ah/rebase-keep-base-fix: rebase: use correct base for --keep-base when a branch is given

Merge branch 'jc/show-branch-g-current' into maint

2022-06-08T21:27:51Z

The "--current" option of "git show-branch" should have been made incompatible with the "--reflog" mode, but this was not enforced, which has been corrected. source: * jc/show-branch-g-current: show-branch: -g and --current are incompatible

Merge branch 'rs/format-patch-pathspec-fix' into maint

2022-05-05T21:36:25Z

"git format-patch -- " lost the pathspec when showing the second and subsequent commits, which has been corrected. source: * rs/format-patch-pathspec-fix: 2.36 format-patch regression fix

Merge branch 'rs/fast-export-pathspec-fix' into maint

2022-05-05T21:36:25Z

"git fast-export -- " lost the pathspec when showing the second and subsequent commits, which has been corrected. source: <2c988c7b-0efe-4222-4a43-8124fe1a9da6@web.de> * rs/fast-export-pathspec-fix: 2.36 fast-export regression fix

Merge branch 'jc/show-pathspec-fix' into maint

2022-05-05T21:36:24Z

"git show ... -- " lost the pathspec when showing the second and subsequent commits, which has been corrected. source: * jc/show-pathspec-fix: 2.36 show regression fix

Merge branch 'rs/name-rev-fix-free-after-use' into maint

2022-05-05T21:36:24Z

Regression fix for 2.36 where "git name-rev" started to sometimes reference strings after they are freed. This fixes a regression in 2.36 and is slate to go to 2.36.1 source: <340c8810-d912-7b18-d46e-a9d43f20216a@web.de> * rs/name-rev-fix-free-after-use: Revert "name-rev: release unused name strings"

Merge branch 'jc/diff-tree-stdin-fix' into maint

2022-05-05T21:36:24Z

"diff-tree --stdin" has been broken for about a year, but 2.36 release broke it even worse by breaking running the command with , which in turn broke "gitk" and got noticed. This has been corrected by aligning its behaviour to that of "log". This fixes a regression in 2.36 and is slate to go to 2.36.1 source: * jc/diff-tree-stdin-fix: 2.36 gitk/diff-tree --stdin regression fix

Merge branch 'gc/submodule-update-part2' into maint

2022-05-05T21:36:24Z

"git submodule update" without pathspec should silently skip an uninitialized submodule, but it started to become noisy by mistake. This fixes a regression in 2.36 and is slate to go to 2.36.1 source: * gc/submodule-update-part2: submodule--helper: fix initialization of warn_if_uninitialized