[stable-2.12] ansible-test - local change detection without --fork-point (#79734) (#80902)

(cherry picked from commit a5bb4c7dee)

Co-authored-by: Felix Fontein <felix@fontein.de>
pull/80940/head
Matt Clay 3 years ago committed by GitHub
parent 061201ee9e
commit 2cf68c252f
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)."

@ -76,7 +76,7 @@ class Git:
def get_branch_fork_point(self, branch): # type: (str) -> str
"""Return a reference to the point at which the given branch was forked."""
cmd = ['merge-base', '--fork-point', branch]
cmd = ['merge-base', branch, 'HEAD']
return self.run_git(cmd).strip()
def is_valid_ref(self, ref): # type: (str) -> bool

Loading…
Cancel
Save