Merge "Exclude some unnecessary merge commits from history"
This commit is contained in:
commit
cba4bdaefa
|
@ -205,14 +205,17 @@ class Searcher(GitMixin):
|
||||||
else:
|
else:
|
||||||
search_list = [(self.branch, upstream, None)]
|
search_list = [(self.branch, upstream, None)]
|
||||||
rev_spec = "{0}...{1}"
|
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)
|
extra_args.append("^%s" % self.commit)
|
||||||
|
|
||||||
for start, end, exclude in search_list:
|
for start, end, exclude in search_list:
|
||||||
extra = list(extra_args)
|
extra = list(extra_args)
|
||||||
if exclude:
|
if exclude:
|
||||||
extra.append(exclude)
|
extra.append(exclude)
|
||||||
extra.append("--")
|
extra.extend(["--", "."])
|
||||||
revision_spec = rev_spec.format(start, end)
|
revision_spec = rev_spec.format(start, end)
|
||||||
self.log.info(
|
self.log.info(
|
||||||
"""
|
"""
|
||||||
|
|
|
@ -50,4 +50,4 @@
|
||||||
head: [master, J]
|
head: [master, J]
|
||||||
upstream: [upstream/master, L]
|
upstream: [upstream/master, L]
|
||||||
|
|
||||||
expected-changes: [D1, G1, H, I, J]
|
expected-changes: [D1, G1, I, J]
|
||||||
|
|
Loading…
Reference in New Issue