From fde305e3598dcb878b423d0340e1e174e1b9ac55 Mon Sep 17 00:00:00 2001 From: Dan Date: Thu, 22 Apr 2021 15:29:05 -0400 Subject: Add trailing -- parameter to git checkouts. --- mesonbuild/wrap/wrap.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mesonbuild/wrap') diff --git a/mesonbuild/wrap/wrap.py b/mesonbuild/wrap/wrap.py index f8e19c9..5fe8b33 100644 --- a/mesonbuild/wrap/wrap.py +++ b/mesonbuild/wrap/wrap.py @@ -415,7 +415,7 @@ class Resolver: 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) - verbose_git(['checkout', revno], self.dirname, check=True) + verbose_git(['checkout', revno, '--'], self.dirname, check=True) if self.wrap.values.get('clone-recursive', '').lower() == 'true': verbose_git(['submodule', 'update', '--init', '--checkout', '--recursive', *depth_option], self.dirname, check=True) @@ -426,9 +426,9 @@ class Resolver: if not is_shallow: verbose_git(['clone', self.wrap.get('url'), self.directory], self.subdir_root, check=True) if revno.lower() != 'head': - if not verbose_git(['checkout', revno], self.dirname): + if not verbose_git(['checkout', revno, '--'], self.dirname): verbose_git(['fetch', self.wrap.get('url'), revno], self.dirname, check=True) - verbose_git(['checkout', revno], self.dirname, check=True) + verbose_git(['checkout', revno, '--'], self.dirname, check=True) else: verbose_git(['clone', *depth_option, '--branch', revno, self.wrap.get('url'), self.directory], self.subdir_root, check=True) -- cgit v1.1