debian: prepare for upload
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
diff --git a/debian/changelog b/debian/changelog
index dd75bad..982b018 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+git (1:2.26.1-1) unstable; urgency=high
+
+ * new upstream point release (see RelNotes/2.26.1.txt).
+ * Addresses the security issue CVE-2020-5260.
+
+ With a crafted URL that contains a newline, the credential
+ helper machinery can be fooled to supply credential information
+ for the wrong host. The attack has been made impossible by
+ forbidding a newline character in any value passed via the
+ credential protocol.
+
+ Thanks to Felix Wilhelm of Google Project Zero for finding
+ this vulnerability and Jeff King for fixing it.
+
+ -- Jonathan Nieder <jrnieder@gmail.com> Tue, 14 Apr 2020 10:29:38 -0700
+
git (1:2.26.0-2) unstable; urgency=low
* fixes to the (newly default) rebase --merge backend:
diff --git a/debian/patches/0001-sequencer-honor-GIT_REFLOG_ACTION.diff b/debian/patches/0001-sequencer-honor-GIT_REFLOG_ACTION.diff
index bb9fb81..9fcc19e 100644
--- a/debian/patches/0001-sequencer-honor-GIT_REFLOG_ACTION.diff
+++ b/debian/patches/0001-sequencer-honor-GIT_REFLOG_ACTION.diff
@@ -1,4 +1,4 @@
-From fcf1eaf8f85f2033de2781406d51cbfea3992e46 Mon Sep 17 00:00:00 2001
+From 0329acb1aa4444da4ee1007674c469c2e63dcf48 Mon Sep 17 00:00:00 2001
From: Elijah Newren <newren@gmail.com>
Date: Tue, 7 Apr 2020 16:59:23 +0000
Subject: sequencer: honor GIT_REFLOG_ACTION
diff --git a/debian/patches/0002-sequencer-don-t-abbreviate-a-command-if-it-doesn-t-ha.diff b/debian/patches/0002-sequencer-don-t-abbreviate-a-command-if-it-doesn-t-ha.diff
index 2930a94..9b8ea8a 100644
--- a/debian/patches/0002-sequencer-don-t-abbreviate-a-command-if-it-doesn-t-ha.diff
+++ b/debian/patches/0002-sequencer-don-t-abbreviate-a-command-if-it-doesn-t-ha.diff
@@ -1,4 +1,4 @@
-From daa1950fb2a54be14fedeaf9f701ed9f186c759c Mon Sep 17 00:00:00 2001
+From b35ddbf9a817dc1d47f2ca888beedfbf526ffe21 Mon Sep 17 00:00:00 2001
From: Alban Gruin <alban.gruin@gmail.com>
Date: Mon, 30 Mar 2020 14:42:35 +0200
Subject: sequencer: don't abbreviate a command if it doesn't have a short form
diff --git a/debian/patches/0003-t3432-test-merge-with-rebase.abbreviateCommands-true-.diff b/debian/patches/0003-t3432-test-merge-with-rebase.abbreviateCommands-true-.diff
index dd9143f..6af81ad 100644
--- a/debian/patches/0003-t3432-test-merge-with-rebase.abbreviateCommands-true-.diff
+++ b/debian/patches/0003-t3432-test-merge-with-rebase.abbreviateCommands-true-.diff
@@ -1,4 +1,4 @@
-From 86879e8ec89989db00f0a738e5efc40dbff74d5f Mon Sep 17 00:00:00 2001
+From 248f9225b2f2deaea6d01fa803f49473e05dd371 Mon Sep 17 00:00:00 2001
From: Alban Gruin <alban.gruin@gmail.com>
Date: Mon, 30 Mar 2020 14:42:36 +0200
Subject: t3432: test `--merge' with `rebase.abbreviateCommands = true', too
