Skip to content
Snippets Groups Projects
Commit b2060cf9 authored by Haibo Huang's avatar Haibo Huang Committed by android-build-merger
Browse files

[Updater] Ignore commits brought in by a merge am: 80a05427 am: a1024615

am: 873fba55

Change-Id: I2ea960c6909c1081bd9a967f69e6219c06957a69
parents edf70831 873fba55
No related branches found
No related tags found
No related merge requests found
...@@ -60,7 +60,7 @@ def list_remotes(proj_path): ...@@ -60,7 +60,7 @@ def list_remotes(proj_path):
def get_commits_ahead(proj_path, branch, base_branch): def get_commits_ahead(proj_path, branch, base_branch):
"""Lists commits in `branch` but not `base_branch`.""" """Lists commits in `branch` but not `base_branch`."""
out = _run(['git', 'rev-list', '--left-only', out = _run(['git', 'rev-list', '--left-only', '--ancestry-path',
'{}...{}'.format(branch, base_branch)], '{}...{}'.format(branch, base_branch)],
proj_path) proj_path)
return out.stdout.decode('utf-8').splitlines() return out.stdout.decode('utf-8').splitlines()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment