git/t, branch v2.36.2Mirror of https://git.kernel.org/pub/scm/git/git.git/
https://git.shady.money/git/atom?h=v2.36.22022-06-23T10:36:12ZSync with 2.35.42022-06-23T10:36:12ZJohannes Schindelinjohannes.schindelin@gmx.de2022-06-23T10:36:12Zurn:sha1:8f8eea8c3aba154ce1f9eaab4fa06c73b60550dc
* maint-2.35:
Git 2.35.4
Git 2.34.4
Git 2.33.4
Git 2.32.3
Git 2.31.4
Git 2.30.5
setup: tighten ownership checks post CVE-2022-24765
git-compat-util: allow root to access both SUDO_UID and root owned
t0034: add negative tests and allow git init to mostly work under sudo
git-compat-util: avoid failing dir ownership checks if running privileged
t: regression git needs safe.directory when using sudo
Sync with 2.34.42022-06-23T10:36:03ZJohannes Schindelinjohannes.schindelin@gmx.de2022-06-23T10:36:03Zurn:sha1:aef3d5948c5b00a0409e117da7e720f574040505
* maint-2.34:
Git 2.34.4
Git 2.33.4
Git 2.32.3
Git 2.31.4
Git 2.30.5
setup: tighten ownership checks post CVE-2022-24765
git-compat-util: allow root to access both SUDO_UID and root owned
t0034: add negative tests and allow git init to mostly work under sudo
git-compat-util: avoid failing dir ownership checks if running privileged
t: regression git needs safe.directory when using sudo
Sync with 2.33.42022-06-23T10:35:47ZJohannes Schindelinjohannes.schindelin@gmx.de2022-06-23T10:35:47Zurn:sha1:378eaded1aec073a815b8687e67a2e2eadd3228c
* maint-2.33:
Git 2.33.4
Git 2.32.3
Git 2.31.4
Git 2.30.5
setup: tighten ownership checks post CVE-2022-24765
git-compat-util: allow root to access both SUDO_UID and root owned
t0034: add negative tests and allow git init to mostly work under sudo
git-compat-util: avoid failing dir ownership checks if running privileged
t: regression git needs safe.directory when using sudo
Sync with 2.32.32022-06-23T10:35:38ZJohannes Schindelinjohannes.schindelin@gmx.de2022-06-23T10:35:38Zurn:sha1:eebfde3f213e2990727a64da0d7d04ad961a28b0
* maint-2.32:
Git 2.32.3
Git 2.31.4
Git 2.30.5
setup: tighten ownership checks post CVE-2022-24765
git-compat-util: allow root to access both SUDO_UID and root owned
t0034: add negative tests and allow git init to mostly work under sudo
git-compat-util: avoid failing dir ownership checks if running privileged
t: regression git needs safe.directory when using sudo
Sync with 2.31.42022-06-23T10:35:30ZJohannes Schindelinjohannes.schindelin@gmx.de2022-06-23T10:35:30Zurn:sha1:fc0c773028685cdbae35c6c71f3fd3b87ab70985
* maint-2.31:
Git 2.31.4
Git 2.30.5
setup: tighten ownership checks post CVE-2022-24765
git-compat-util: allow root to access both SUDO_UID and root owned
t0034: add negative tests and allow git init to mostly work under sudo
git-compat-util: avoid failing dir ownership checks if running privileged
t: regression git needs safe.directory when using sudo
Sync with 2.30.52022-06-23T10:35:23ZJohannes Schindelinjohannes.schindelin@gmx.de2022-06-23T10:35:23Zurn:sha1:2f8809f9a1838eb607f14097dcd63071f2eb00fe
* maint-2.30:
Git 2.30.5
setup: tighten ownership checks post CVE-2022-24765
git-compat-util: allow root to access both SUDO_UID and root owned
t0034: add negative tests and allow git init to mostly work under sudo
git-compat-util: avoid failing dir ownership checks if running privileged
t: regression git needs safe.directory when using sudo
git-compat-util: allow root to access both SUDO_UID and root owned2022-06-17T21:03:08ZCarlo Marcelo Arenas Belóncarenas@gmail.com2022-06-17T20:23:38Zurn:sha1:6b11e3d52e919cce91011f4f9025e6f4b61375f2
Previous changes introduced a regression which will prevent root for
accessing repositories owned by thyself if using sudo because SUDO_UID
takes precedence.
Loosen that restriction by allowing root to access repositories owned
by both uid by default and without having to add a safe.directory
exception.
A previous workaround that was documented in the tests is no longer
needed so it has been removed together with its specially crafted
prerequisite.
Helped-by: Johanness Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'ah/rebase-keep-base-fix' into maint2022-06-08T21:27:52ZJunio C Hamanogitster@pobox.com2022-06-08T21:27:52Zurn:sha1:363d54ff806097ee01ad0614dda950d0ca88987c
"git rebase --keep-base <upstream> <branch-to-rebase>" 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 'pw/test-malloc-with-sanitize-address' into maint2022-06-08T21:27:52ZJunio C Hamanogitster@pobox.com2022-06-08T21:27:52Zurn:sha1:d777ef9befe7cdf595981686954427d8cd6e4c4c
Avoid problems from interaction between malloc_check and address
sanitizer.
source: <pull.1210.git.1649507317350.gitgitgadget@gmail.com>
* pw/test-malloc-with-sanitize-address:
tests: make SANITIZE=address imply TEST_NO_MALLOC_CHECK
Merge branch 'rs/commit-summary-wo-break-rewrite' into maint2022-06-08T21:27:52ZJunio C Hamanogitster@pobox.com2022-06-08T21:27:52Zurn:sha1:ac8f6b6608315ea11d64ba331ea39cf985f577f5
The commit summary shown after making a commit is matched to what
is given in "git status" not to use the break-rewrite heuristics.
source: <c35bd0aa-2e46-e710-2b39-89f18bad0097@web.de>
* rs/commit-summary-wo-break-rewrite:
commit, sequencer: turn off break_opt for commit summary