git, branch v2.38.2

Git 2.38.2

2022-12-11T00:32:48Z

Signed-off-by: Junio C Hamano

ci: use a newer `github-script` version

2022-12-10T07:32:16Z

The old version we currently use runs in node.js v12.x, which is being deprecated in GitHub Actions. The new version uses node.js v16.x. Incidentally, this also avoids the warning about the deprecated `::set-output::` workflow command because the newer version of the `github-script` Action uses the recommended new way to specify outputs. Signed-off-by: Johannes Schindelin Signed-off-by: Taylor Blau

Merge branch 'jx/ci-ubuntu-fix' into maint-2.38

2022-12-10T07:17:47Z

Adjust the GitHub CI to newer ubuntu release. * jx/ci-ubuntu-fix: ci: install python on ubuntu ci: use the same version of p4 on both Linux and macOS ci: remove the pipe after "p4 -V" to catch errors github-actions: run gcc-8 on ubuntu-20.04 image

Merge branch 'js/ci-use-newer-up-down-artifact' into maint-2.38

2022-12-10T05:02:09Z

CI fix. * js/ci-use-newer-up-down-artifact: ci: avoid using deprecated {up,down}load-artifacts Action

Merge branch 'ab/ci-use-macos-12' into maint-2.38

2022-12-10T05:02:09Z

CI fix. * ab/ci-use-macos-12: CI: upgrade to macos-12, and pin OSX version

Merge branch 'ab/ci-retire-set-output' into maint-2.38

2022-12-10T05:02:09Z

CI fix. * ab/ci-retire-set-output: CI: migrate away from deprecated "set-output" syntax

Merge branch 'ab/ci-musl-bash-fix' into maint-2.38

2022-12-10T05:02:09Z

CI fix. * ab/ci-musl-bash-fix: CI: don't explicitly pick "bash" shell outside of Windows, fix regression

Merge branch 'od/ci-use-checkout-v3-when-applicable' into maint-2.38

2022-12-10T05:02:09Z

Update GitHub CI to use actions/checkout@v3; use of the older checkout@v2 gets annoying deprecation notices. * od/ci-use-checkout-v3-when-applicable: ci(main): upgrade actions/checkout to v3

rebase --update-refs: avoid unintended ref deletion

2022-12-09T10:31:45Z

In b3b1a21d1a5 (sequencer: rewrite update-refs as user edits todo list, 2022-07-19), the 'todo_list_filter_update_refs()' step was added to handle the removal of 'update-ref' lines from a 'rebase-todo'. Specifically, it removes potential ref updates from the "update refs state" if a ref does not have a corresponding 'update-ref' line. However, because 'write_update_refs_state()' will not update the state if the 'refs_to_oids' list was empty, removing *all* 'update-ref' lines will result in the state remaining unchanged from how it was initialized (with all refs' "after" OID being null). Then, when the ref update is applied, all refs will be updated to null and consequently deleted. To fix this, delete the 'update-refs' state file when 'refs_to_oids' is empty. Additionally, add a tests covering "all update-ref lines removed" cases. Reported-by: herr.kaste Helped-by: Phillip Wood Helped-by: Derrick Stolee Signed-off-by: Victoria Dye Signed-off-by: Taylor Blau

CI: migrate away from deprecated "set-output" syntax

2022-12-07T23:47:22Z

As noted in [1] and the warnings the CI itself is spewing echoing outputs to stdout is deprecated, and they should be written to "$GITHUB_OUTPUT" instead. 1. https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/ Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano