diff -Nru dulwich-0.16.1/debian/changelog dulwich-0.16.1/debian/changelog --- dulwich-0.16.1/debian/changelog 2016-12-25 13:42:56.000000000 +0000 +++ dulwich-0.16.1/debian/changelog 2016-12-26 11:24:46.000000000 +0000 @@ -1,3 +1,10 @@ +dulwich (0.16.1-2) unstable; urgency=low + + * Add patch older-git: skip worktree list test against older versions + of git. + + -- Jelmer Vernooij Mon, 26 Dec 2016 11:24:46 +0000 + dulwich (0.16.1-1) unstable; urgency=medium * New upstream release. diff -Nru dulwich-0.16.1/debian/patches/older-git dulwich-0.16.1/debian/patches/older-git --- dulwich-0.16.1/debian/patches/older-git 1970-01-01 00:00:00.000000000 +0000 +++ dulwich-0.16.1/debian/patches/older-git 2016-12-26 11:24:46.000000000 +0000 @@ -0,0 +1,27 @@ +commit cad0484f5293c8e95673ab2744680dcc977099b0 +Author: Jelmer Vernooij +Date: Mon Dec 26 11:20:17 2016 +0000 + + Only run 'git worktree list' when it is available. + +diff --git a/dulwich/tests/compat/test_repository.py b/dulwich/tests/compat/test_repository.py +index ee19ae6..c39ff84 100644 +--- a/dulwich/tests/compat/test_repository.py ++++ b/dulwich/tests/compat/test_repository.py +@@ -34,6 +34,7 @@ from dulwich.repo import ( + Repo, + ) + from dulwich.tests.compat.utils import ( ++ require_git_version, + rmtree_ro, + run_git_or_fail, + CompatTestCase, +@@ -172,6 +172,8 @@ class WorkingTreeTestCase(ObjectStoreTestCase): + return worktrees + + def test_git_worktree_list(self): ++ # 'git worktree list' was introduced in 2.7.0 ++ require_git_version((2, 7, 0)) + output = run_git_or_fail(['worktree', 'list'], cwd=self._repo.path) + worktrees = self._parse_worktree_list(output) + self.assertEqual(len(worktrees), self._number_of_working_tree) diff -Nru dulwich-0.16.1/debian/patches/series dulwich-0.16.1/debian/patches/series --- dulwich-0.16.1/debian/patches/series 2016-12-25 13:41:58.000000000 +0000 +++ dulwich-0.16.1/debian/patches/series 2016-12-26 11:24:46.000000000 +0000 @@ -0,0 +1 @@ +older-git