[stable-2.9] ansible-test - local change detection without --fork-point (#79734). (#80903)

(cherry picked from commit a5bb4c7dee)

Co-authored-by: Felix Fontein <felix@fontein.de>
pull/80951/head
Matt Clay 3 years ago committed by GitHub
parent 3249ae9614
commit e536c8ded9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -0,0 +1,2 @@
bugfixes:
- "ansible-test local change detection - use ``git merge-base <branch> HEAD`` instead of ``git merge-base --fork-point <branch>`` (https://github.com/ansible/ansible/pull/79734)."

@ -99,7 +99,7 @@ class Git:
:type branch: str
:rtype: str
"""
cmd = ['merge-base', '--fork-point', branch]
cmd = ['merge-base', branch, 'HEAD']
return self.run_git(cmd).strip()
def is_valid_ref(self, ref):

Loading…
Cancel
Save