aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorTaihsiang Ho (tai271828) <e@tai271828.me>2023-10-16 22:03:14 +0200
committerGuido Günther <agx@sigxcpu.org>2023-10-17 10:47:38 +0200
commitd1a974589d2ae58a8704be9e6401305be639fa1d (patch)
tree8b5487b40185b1a6a93348401bfbf1df9b0a3a2c
parent6923df4a06cc26c09963aa85a9a632f047b17c2a (diff)
d/control: Specify required git version as dependency
Explicitly specify the git version to facilitate easier backporting. Developers can align with this git version to reduce false alarms due to version inconsistencies. The latest git-buildpackage requires a newer git version to avoid test failures. For example, building the source in bookworm with git 1:2.39.2-1.1 results in: $ ./packaging/run-in-docker -t bookworm FAIL: Doctest: tests.doctests.test_GitRepository.test_clone ---------------------------------------------------------------------- Traceback (most recent call last): File "/usr/lib/python3.11/doctest.py", line 2222, in runTest raise self.failureException(self.format_failure(new.getvalue())) AssertionError: Failed doctest test for test_clone File "/workdir/project/tests/doctests/test_GitRepository.py", line 626, in test_clone ---------------------------------------------------------------------- File "/workdir/project/tests/doctests/test_GitRepository.py", line 649, in test_clone Failed example: clone.get_remote_branches() Expected: ['origin', 'origin/foo', 'origin/master'] Got: ['origin/HEAD', 'origin/foo', 'origin/master'] -------------------- >> begin captured logging << -------------------- gbp: debug: ['git', 'rev-parse', '--show-cdup'] gbp: debug: ['git', 'rev-parse', '--is-bare-repository'] gbp: debug: ['git', 'rev-parse', '--git-dir'] gbp: debug: ['git', 'symbolic-ref', 'HEAD'] gbp: debug: ['git', 'show-ref', 'refs/heads/master'] gbp: debug: ['git', 'clone', '--quiet', '/tmp/tmp72nxjjwzgbp_tests.doctests.test_GitRepository_/repo'] gbp: debug: ['git', 'rev-parse', '--show-cdup'] gbp: debug: ['git', 'rev-parse', '--is-bare-repository'] gbp: debug: ['git', 'rev-parse', '--git-dir'] gbp: debug: ['git', 'for-each-ref', '--format=%(refname:short)', 'refs/heads/'] gbp: debug: ['git', 'symbolic-ref', 'HEAD'] gbp: debug: ['git', 'show-ref', 'refs/heads/master'] gbp: debug: ['git', 'for-each-ref', '--format=%(refname:short)', 'refs/remotes/'] gbp: debug: ['git', 'for-each-ref', '--format=%(refname:short)', 'refs/heads/'] gbp: debug: ['git', 'config', 'branch.master.remote'] gbp: debug: ['git', 'config', 'branch.master.merge'] gbp: debug: ['git', 'branch', 'foo', 'origin/foo'] gbp: debug: ['git', 'config', 'branch.foo.remote'] gbp: debug: ['git', 'config', 'branch.foo.merge'] gbp: debug: ['git', 'branch', 'bar'] gbp: debug: ['git', 'config', 'branch.bar.remote'] gbp: debug: ['git', 'for-each-ref', '--format=%(refname:short)', 'refs/heads/'] gbp: debug: ['git', 'remote'] gbp: debug: ['git', 'remote'] gbp: debug: ['git', 'remote', 'show', '-n', 'origin'] gbp: debug: ['git', 'show-ref', '--verify', 'refs/remotes/origin/master'] gbp: debug: ['git', 'remote'] gbp: debug: ['git', 'remote', 'show', '-n', 'origin'] --------------------- >> end captured logging << ---------------------
-rw-r--r--debian/control4
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/control b/debian/control
index d030e4ca..7c70f07c 100644
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,7 @@ Build-Depends:
bzip2 <!nocheck>,
cpio <!nocheck>,
devscripts (>= 2.17.7~) <!nocheck>,
- git (>= 1:1.7.9.1-1~) <!nocheck>,
+ git (>= 1:2.40.1-1) <!nocheck>,
pristine-tar (>= 1.14) <!nocheck>,
rpm (>= 4.16.1) <!nocheck>,
unzip <!nocheck>,
@@ -51,7 +51,7 @@ Depends: ${python3:Depends},
${shlibs:Depends},
${misc:Depends},
devscripts (>= 2.13.5~),
- git (>= 1:1.7.9.1-1~),
+ git (>= 1:2.40.1-1),
man-db,
python3-dateutil,
python3-pkg-resources,