Merge "Exclude some unnecessary merge commits from history"

This commit is contained in:
Jenkins 2017-03-16 10:48:50 +00:00 committed by Gerrit Code Review
commit cba4bdaefa
2 changed files with 6 additions and 3 deletions

View File

@ -205,14 +205,17 @@ class Searcher(GitMixin):
else:
search_list = [(self.branch, upstream, None)]
rev_spec = "{0}...{1}"
git_args = {'cherry_pick': True, 'left_only': True}
git_args = {'cherry_pick': True,
'left_only': True,
'full_history': True,
}
extra_args.append("^%s" % self.commit)
for start, end, exclude in search_list:
extra = list(extra_args)
if exclude:
extra.append(exclude)
extra.append("--")
extra.extend(["--", "."])
revision_spec = rev_spec.format(start, end)
self.log.info(
"""

View File

@ -50,4 +50,4 @@
head: [master, J]
upstream: [upstream/master, L]
expected-changes: [D1, G1, H, I, J]
expected-changes: [D1, G1, I, J]