cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix ansible-test PR diff handling.

Browse source 
Permits use of PRs on branches other than devel.

(cherry picked from commit f7c83ccdc0)
This commit is contained in:
Matt Clay 2017-03-16 09:59:45 -07:00
parent 3f276c5def
commit dc8ad50eaa
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/runner/lib/changes.py
View file

@ -68,8 +68,8 @@ class ShippableChanges(object):
raise ChangeDetectionNotSupported('Change detection is not supported for tags.') raise ChangeDetectionNotSupported('Change detection is not supported for tags.')
if self.is_pr: if self.is_pr:
self.paths = sorted(git.get_diff_names([self.branch])) self.paths = sorted(git.get_diff_names(['origin/%s' % self.branch, '--']))
self.diff = git.get_diff([self.branch]) self.diff = git.get_diff(['origin/%s' % self.branch, '--'])
else: else:
merge_runs = self.get_merge_runs(self.project_id, self.branch) merge_runs = self.get_merge_runs(self.project_id, self.branch)
last_successful_commit = self.get_last_successful_commit(git, merge_runs) last_successful_commit = self.get_last_successful_commit(git, merge_runs)