From c17561ec12c12dd3710c0989bda43403908460dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Thu, 13 Jun 2024 15:26:45 +0200 Subject: [PATCH] ansible/roles.py: fix checking git ancestry MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jakub SokoĊ‚owski --- ansible/roles.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles.py b/ansible/roles.py index a013925..ab0d52c 100755 --- a/ansible/roles.py +++ b/ansible/roles.py @@ -192,8 +192,8 @@ class Role: def is_ancestor(self): if self.required is None or self.required == self.current_commit: return False - return self._git_fail_is_false( - self.required, '--is-ancestor', self.current_commit + return not self._git_fail_is_false( + 'merge-base', self.required, '--is-ancestor', self.current_commit ) @property