aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2021-10-25 21:13:21 -0400
committerXavier Claessens <xclaesse@gmail.com>2021-10-27 10:44:11 -0400
commit6ed13326034f5616b4b886d3831a7168841460c4 (patch)
treef9b779be68a9dc66ddf94d4498ef9d8601180f59
parent135b3bc0fd5e283e01e1401370909e99bdaa88a1 (diff)
downloadmeson-6ed13326034f5616b4b886d3831a7168841460c4.zip
meson-6ed13326034f5616b4b886d3831a7168841460c4.tar.gz
meson-6ed13326034f5616b4b886d3831a7168841460c4.tar.bz2
wrap: fix support for git < 2.28
both of these do the same thing: init -b <branchname> -c init.defaultBranch=<branchname> init The latter contributes to unreadably long lines of code, but has the advantage of working on older versions of git. Fixes #9449
-rw-r--r--mesonbuild/wrap/wrap.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/wrap/wrap.py b/mesonbuild/wrap/wrap.py
index 0cc68f0..08da319 100644
--- a/mesonbuild/wrap/wrap.py
+++ b/mesonbuild/wrap/wrap.py
@@ -418,7 +418,7 @@ class Resolver:
if is_shallow and self.is_git_full_commit_id(revno):
# git doesn't support directly cloning shallowly for commits,
# so we follow https://stackoverflow.com/a/43136160
- verbose_git(['init', '-b', 'meson-dummy-branch', self.directory], self.subdir_root, check=True)
+ verbose_git(['-c', 'init.defaultBranch=meson-dummy-branch', 'init', self.directory], self.subdir_root, check=True)
verbose_git(['remote', 'add', 'origin', self.wrap.get('url')], self.dirname, check=True)
revno = self.wrap.get('revision')
verbose_git(['fetch', *depth_option, 'origin', revno], self.dirname, check=True)