Skip to content

Commit ea4bc1e

Browse files
dschodscho
committed
Merge tag 'v2.36.2' into HEAD
Git 2.36.2 Signed-off-by: Johannes Schindelin <[email protected]>
2 parents 66626c1 + fd59c5b commit ea4bc1e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+608
-93
lines changed

‎Documentation/RelNotes/2.30.5.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
Git v2.30.5 Release Notes
2+
=========================
3+
4+
This release contains minor fix-ups for the changes that went into
5+
Git 2.30.3 and 2.30.4, addressing CVE-2022-29187.
6+
7+
* The safety check that verifies a safe ownership of the Git
8+
worktree is now extended to also cover the ownership of the Git
9+
directory (and the `.git` file, if there is any).
10+
11+
Carlo Marcelo Arenas Belón (1):
12+
setup: tighten ownership checks post CVE-2022-24765

‎Documentation/RelNotes/2.31.4.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Git v2.31.4 Release Notes
2+
=========================
3+
4+
This release merges up the fixes that appear in v2.30.5 to address
5+
the security issue CVE-2022-29187; see the release notes for that
6+
version for details.

‎Documentation/RelNotes/2.32.3.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Git v2.32.3 Release Notes
2+
=========================
3+
4+
This release merges up the fixes that appear in v2.30.5 and
5+
v2.31.4 to address the security issue CVE-2022-29187; see the
6+
release notes for these versions for details.

‎Documentation/RelNotes/2.33.4.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Git v2.33.4 Release Notes
2+
=========================
3+
4+
This release merges up the fixes that appear in v2.30.5, v2.31.4
5+
and v2.32.3 to address the security issue CVE-2022-29187; see
6+
the release notes for these versions for details.

‎Documentation/RelNotes/2.34.4.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Git v2.34.4 Release Notes
2+
=========================
3+
4+
This release merges up the fixes that appear in v2.30.5, v2.31.4,
5+
v2.32.3 and v2.33.4 to address the security issue CVE-2022-29187;
6+
see the release notes for these versions for details.

‎Documentation/RelNotes/2.35.4.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Git v2.35.4 Release Notes
2+
=========================
3+
4+
This release merges up the fixes that appear in v2.30.5,
5+
v2.31.4, v2.32.3, v2.33.4 and v2.34.4 to address the security
6+
issue CVE-2022-29187; see the release notes for these versions
7+
for details.

‎Documentation/RelNotes/2.36.2.txt

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
Git v2.36.2 Release Notes
2+
=========================
3+
4+
This release merges up the fixes that appear in v2.30.5, v2.31.4,
5+
v2.32.3, v2.33.4, v2.34.4 and v2.35.4 to address the security
6+
issue CVE-2022-29187; see the release notes for these versions
7+
for details.
8+
9+
Apart from that, this maintenance release is primarily to merge down
10+
updates to the build and CI procedures from the 'master' front, in
11+
order to ensure that we can cut healthy maintenance releases in the
12+
future. It also contains a handful of small and trivially-correct
13+
bugfixes.
14+
15+
Fixes since v2.36.1
16+
-------------------
17+
18+
* Fixes real problems noticed by gcc 12 and works around false
19+
positives.
20+
21+
* Update URL to the gitk repository.
22+
23+
* The "--current" option of "git show-branch" should have been made
24+
incompatible with the "--reflog" mode, but this was not enforced,
25+
which has been corrected.
26+
27+
* "git archive --add-file=<path>" picked up the raw permission bits
28+
from the path and propagated to zip output in some cases, without
29+
normalization, which has been corrected (tar output did not have
30+
this issue).
31+
32+
* A bit of test framework fixes with a few fixes to issues found by
33+
valgrind.
34+
35+
* macOS CI jobs have been occasionally flaky due to tentative version
36+
skew between perforce and the homebrew packager. Instead of
37+
failing the whole CI job, just let it skip the p4 tests when this
38+
happens.
39+
40+
* The commit summary shown after making a commit is matched to what
41+
is given in "git status" not to use the break-rewrite heuristics.
42+
43+
* Avoid problems from interaction between malloc_check and address
44+
sanitizer.
45+
46+
* "git rebase --keep-base <upstream> <branch-to-rebase>" computed the
47+
commit to rebase onto incorrectly, which has been corrected.
48+
49+
* The path taken by "git multi-pack-index" command from the end user
50+
was compared with path internally prepared by the tool withut first
51+
normalizing, which lead to duplicated paths not being noticed,
52+
which has been corrected.
53+
54+
* "git clone --origin X" leaked piece of memory that held value read
55+
from the clone.defaultRemoteName configuration variable, which has
56+
been plugged.

‎Documentation/SubmittingPatches

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,10 @@ repositories.
452452

453453
- `gitk-git/` comes from Paul Mackerras's gitk project:
454454

455-
git://ozlabs.org/~paulus/gitk
455+
git://git.ozlabs.org/~paulus/gitk
456+
457+
Those who are interested in improve gitk can volunteer to help Paul
458+
in maintaining it cf. <YntxL/fTplFm8lr6@cleo>.
456459

457460
- `po/` comes from the localization coordinator, Jiang Xin:
458461

‎Documentation/config/safe.txt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,19 @@ Unix' simpler permission model, it can be a bit tricky to figure out why
3232
a directory is considered unsafe. To help with this, Git will provide
3333
more detailed information when the environment variable
3434
`GIT_TEST_DEBUG_UNSAFE_DIRECTORIES` is set to `true`.
35+
+
36+
As explained, Git only allows you to access repositories owned by
37+
yourself, i.e. the user who is running Git, by default. When Git
38+
is running as 'root' in a non Windows platform that provides sudo,
39+
however, git checks the SUDO_UID environment variable that sudo creates
40+
and will allow access to the uid recorded as its value in addition to
41+
the id from 'root'.
42+
+
43+
This is to make it easy to perform a common sequence during installation
44+
"make && sudo make install". A git process running under 'sudo' runs as
45+
'root' but the 'sudo' command exports the environment variable to record
46+
which id the original user has.
47+
+
48+
If that is not what you would prefer and want git to only trust
49+
repositories that are owned by root instead, then you can remove
50+
the `SUDO_UID` variable from root's environment before invoking git.

‎Documentation/git-rebase.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,9 +215,10 @@ leave out at most one of A and B, in which case it defaults to HEAD.
215215

216216
--keep-base::
217217
Set the starting point at which to create the new commits to the
218-
merge base of <upstream> <branch>. Running
218+
merge base of <upstream> and <branch>. Running
219219
'git rebase --keep-base <upstream> <branch>' is equivalent to
220-
running 'git rebase --onto <upstream>... <upstream>'.
220+
running
221+
'git rebase --onto <upstream>...<branch> <upstream> <branch>'.
221222
+
222223
This option is useful in the case where one is developing a feature on
223224
top of an upstream branch. While the feature is being worked on, the

0 commit comments

Comments
 (0)