Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Return early when no merge base commit

Browse source
This commit is contained in:
Kagami Sascha Rosylight 2020-06-21 05:00:49 +02:00
parent 90449ae147
commit 1d2e618e5b
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
python/tidy/servo_tidy/tidy.py
View file

@ -143,12 +143,7 @@ class FileList(object):
self.excluded = exclude_dirs
self.generator = self._filter_excluded() if exclude_dirs else self._default_walk()
if only_changed_files:
try:
# Fall back if git doesn't work
self.generator = self._git_changed_files()
except subprocess.CalledProcessError:
pass
self.generator = self._git_changed_files()
if progress:
self.generator = progress_wrapper(self.generator)
@ -160,6 +155,9 @@ class FileList(object):
def _git_changed_files(self):
args = ["git", "log", "-n1", "--merges", "--format=%H"]
last_merge = subprocess.check_output(args, universal_newlines=True).strip()
if not last_merge:
return
args = ["git", "diff", "--name-only", last_merge, self.directory]
file_list = normilize_paths(subprocess.check_output(args, universal_newlines=True).splitlines())