Merge branch 'debian-sid' into debian-experimental
* debian-sid:
debian: new upstream point release
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Change-Id: I658425b7f3a7c6a9ad49fc6546bebcbbb9afbf34
diff --git a/debian/changelog b/debian/changelog
index f45b7ddb..9b3b1cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,16 @@
-git (1:2.45.1+next.20240614-0.1) experimental; urgency=low
+git (1:2.45.2+next.20240614-1) experimental; urgency=low
+ * merge branch debian-sid.
* new snapshot, taken from upstream commit 447d99e1.
- -- Jonathan Nieder <jrnieder@gmail.com> Sun, 16 Jun 2024 16:09:35 +0000
+ -- Jonathan Nieder <jrnieder@gmail.com> Sun, 16 Jun 2024 16:13:36 +0000
+
+git (1:2.45.2-1) unstable; urgency=low
+
+ * new upstream point release (see RelNotes/2.45.2.txt).
+ * debian/patches/*: remove; applied upstream.
+
+ -- Jonathan Nieder <jrnieder@gmail.com> Sun, 16 Jun 2024 15:40:09 +0000
git (1:2.45.1+next.20240516-1) experimental; urgency=medium
diff --git a/debian/changelog.upstream b/debian/changelog.upstream
index 5fbfca6..2755c2a 100644
--- a/debian/changelog.upstream
+++ b/debian/changelog.upstream
@@ -772,7 +772,7 @@
t9604: Fix test for musl libc and new Debian
-Version v2.45.0-rc0; changes since v2.44.1:
+Version v2.45.0-rc0; changes since v2.44.2:
-------------------------------------------
Ahelenia Ziemiańska (1):
@@ -1369,6 +1369,29 @@
t9117: prefer test_path_* helper functions
+Version v2.44.2; changes since v2.44.1:
+---------------------------------------
+
+Jeff King (5):
+ send-email: drop FakeTerm hack
+ send-email: avoid creating more than one Term::ReadLine object
+ ci: drop mention of BREW_INSTALL_PACKAGES variable
+ ci: avoid bare "gcc" for osx-gcc job
+ ci: stop installing "gcc-13" for osx-gcc
+
+Johannes Schindelin (6):
+ hook: plug a new memory leak
+ init: use the correct path of the templates directory again
+ Revert "core.hooksPath: add some protection while cloning"
+ tests: verify that `clone -c core.hooksPath=/dev/null` works again
+ clone: drop the protections where hooks aren't run
+ Revert "Add a helper function to compare file contents"
+
+Junio C Hamano (2):
+ Revert "fsck: warn about symlink pointing inside a gitdir"
+ Git 2.39.5
+
+
Version v2.44.1; changes since v2.44.0:
---------------------------------------
@@ -1563,7 +1586,7 @@
ref-filter.c: sort formatted dates by byte value
-Version v2.44.0-rc0; changes since v2.43.4:
+Version v2.44.0-rc0; changes since v2.43.5:
-------------------------------------------
Achu Luma (2):
@@ -1912,6 +1935,29 @@
subtree: fix split processing with multiple subtrees present
+Version v2.43.5; changes since v2.43.4:
+---------------------------------------
+
+Jeff King (5):
+ send-email: drop FakeTerm hack
+ send-email: avoid creating more than one Term::ReadLine object
+ ci: drop mention of BREW_INSTALL_PACKAGES variable
+ ci: avoid bare "gcc" for osx-gcc job
+ ci: stop installing "gcc-13" for osx-gcc
+
+Johannes Schindelin (6):
+ hook: plug a new memory leak
+ init: use the correct path of the templates directory again
+ Revert "core.hooksPath: add some protection while cloning"
+ tests: verify that `clone -c core.hooksPath=/dev/null` works again
+ clone: drop the protections where hooks aren't run
+ Revert "Add a helper function to compare file contents"
+
+Junio C Hamano (2):
+ Revert "fsck: warn about symlink pointing inside a gitdir"
+ Git 2.39.5
+
+
Version v2.43.4; changes since v2.43.3:
---------------------------------------
@@ -2360,7 +2406,7 @@
merge-file: add an option to process object IDs
-Version v2.43.0-rc0; changes since v2.42.2:
+Version v2.43.0-rc0; changes since v2.42.3:
-------------------------------------------
Alyssa Ross (1):
@@ -2756,6 +2802,29 @@
doc: correct the 50 characters soft limit (+)
+Version v2.42.3; changes since v2.42.2:
+---------------------------------------
+
+Jeff King (5):
+ send-email: drop FakeTerm hack
+ send-email: avoid creating more than one Term::ReadLine object
+ ci: drop mention of BREW_INSTALL_PACKAGES variable
+ ci: avoid bare "gcc" for osx-gcc job
+ ci: stop installing "gcc-13" for osx-gcc
+
+Johannes Schindelin (6):
+ hook: plug a new memory leak
+ init: use the correct path of the templates directory again
+ Revert "core.hooksPath: add some protection while cloning"
+ tests: verify that `clone -c core.hooksPath=/dev/null` works again
+ clone: drop the protections where hooks aren't run
+ Revert "Add a helper function to compare file contents"
+
+Junio C Hamano (2):
+ Revert "fsck: warn about symlink pointing inside a gitdir"
+ Git 2.39.5
+
+
Version v2.42.2; changes since v2.42.1:
---------------------------------------
@@ -3074,7 +3143,7 @@
gitignore: ignore clangd .cache directory
-Version v2.42.0-rc0; changes since v2.41.1:
+Version v2.42.0-rc0; changes since v2.41.2:
-------------------------------------------
Alejandro R. Sedeño (1):
@@ -3562,6 +3631,29 @@
var: add config file locations
+Version v2.41.2; changes since v2.41.1:
+---------------------------------------
+
+Jeff King (5):
+ send-email: drop FakeTerm hack
+ send-email: avoid creating more than one Term::ReadLine object
+ ci: drop mention of BREW_INSTALL_PACKAGES variable
+ ci: avoid bare "gcc" for osx-gcc job
+ ci: stop installing "gcc-13" for osx-gcc
+
+Johannes Schindelin (6):
+ hook: plug a new memory leak
+ init: use the correct path of the templates directory again
+ Revert "core.hooksPath: add some protection while cloning"
+ tests: verify that `clone -c core.hooksPath=/dev/null` works again
+ clone: drop the protections where hooks aren't run
+ Revert "Add a helper function to compare file contents"
+
+Junio C Hamano (2):
+ Revert "fsck: warn about symlink pointing inside a gitdir"
+ Git 2.39.5
+
+
Version v2.41.1; changes since v2.41.0:
---------------------------------------
@@ -3710,7 +3802,7 @@
upload-pack: advertise capabilities when cloning empty repos
-Version v2.41.0-rc0; changes since v2.40.2:
+Version v2.41.0-rc0; changes since v2.40.3:
-------------------------------------------
Adam Johnson (1):
@@ -4297,6 +4389,29 @@
branch, for-each-ref, tag: add option to omit empty lines
+Version v2.40.3; changes since v2.40.2:
+---------------------------------------
+
+Jeff King (5):
+ send-email: drop FakeTerm hack
+ send-email: avoid creating more than one Term::ReadLine object
+ ci: drop mention of BREW_INSTALL_PACKAGES variable
+ ci: avoid bare "gcc" for osx-gcc job
+ ci: stop installing "gcc-13" for osx-gcc
+
+Johannes Schindelin (6):
+ hook: plug a new memory leak
+ init: use the correct path of the templates directory again
+ Revert "core.hooksPath: add some protection while cloning"
+ tests: verify that `clone -c core.hooksPath=/dev/null` works again
+ clone: drop the protections where hooks aren't run
+ Revert "Add a helper function to compare file contents"
+
+Junio C Hamano (2):
+ Revert "fsck: warn about symlink pointing inside a gitdir"
+ Git 2.39.5
+
+
Version v2.40.2; changes since v2.40.1:
---------------------------------------
@@ -4526,7 +4641,7 @@
trace.c, git.c: remove unnecessary parameter to trace_repo_setup()
-Version v2.40.0-rc0; changes since v2.39.4:
+Version v2.40.0-rc0; changes since v2.39.5:
-------------------------------------------
Adam Szkoda (1):
@@ -4934,6 +5049,29 @@
date.c: allow ISO 8601 reduced precision times
+Version v2.39.5; changes since v2.39.4:
+---------------------------------------
+
+Jeff King (5):
+ send-email: drop FakeTerm hack
+ send-email: avoid creating more than one Term::ReadLine object
+ ci: drop mention of BREW_INSTALL_PACKAGES variable
+ ci: avoid bare "gcc" for osx-gcc job
+ ci: stop installing "gcc-13" for osx-gcc
+
+Johannes Schindelin (6):
+ hook: plug a new memory leak
+ init: use the correct path of the templates directory again
+ Revert "core.hooksPath: add some protection while cloning"
+ tests: verify that `clone -c core.hooksPath=/dev/null` works again
+ clone: drop the protections where hooks aren't run
+ Revert "Add a helper function to compare file contents"
+
+Junio C Hamano (2):
+ Revert "fsck: warn about symlink pointing inside a gitdir"
+ Git 2.39.5
+
+
Version v2.39.4; changes since v2.39.3:
---------------------------------------
diff --git a/debian/versions.upstream b/debian/versions.upstream
index 45d4be8..fd8f950 100644
--- a/debian/versions.upstream
+++ b/debian/versions.upstream
@@ -832,23 +832,27 @@
v2.39.2
v2.39.3
v2.39.4
+v2.39.5
v2.40.0-rc0
v2.40.0-rc1
v2.40.0-rc2
v2.40.0
v2.40.1
v2.40.2
+v2.40.3
v2.41.0-rc0
v2.41.0-rc1
v2.41.0-rc2
v2.41.0
v2.41.1
+v2.41.2
v2.42.0-rc0
v2.42.0-rc1
v2.42.0-rc2
v2.42.0
v2.42.1
v2.42.2
+v2.42.3
v2.43.0-rc0
v2.43.0-rc1
v2.43.0-rc2
@@ -857,11 +861,13 @@
v2.43.2
v2.43.3
v2.43.4
+v2.43.5
v2.44.0-rc0
v2.44.0-rc1
v2.44.0-rc2
v2.44.0
v2.44.1
+v2.44.2
v2.45.0-rc0
v2.45.0-rc1
v2.45.0
