From 6ed13326034f5616b4b886d3831a7168841460c4 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Mon, 25 Oct 2021 21:13:21 -0400 Subject: wrap: fix support for git < 2.28 both of these do the same thing: init -b -c init.defaultBranch= init The latter contributes to unreadably long lines of code, but has the advantage of working on older versions of git. Fixes #9449 --- mesonbuild/wrap/wrap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mesonbuild/wrap') 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) -- cgit v1.1