Skip to content
Snippets Groups Projects
Commit bbc7deb7 authored by Daniel Brown's avatar Daniel Brown
Browse files

stopping merges from appearing in test commit lists

parent b5cc3226
No related branches found
No related tags found
No related merge requests found
...@@ -492,7 +492,7 @@ def finesse_get_log(count,branch): ...@@ -492,7 +492,7 @@ def finesse_get_log(count,branch):
except Exception as ex: except Exception as ex:
print "git pull error : " + str(ex) print "git pull error : " + str(ex)
[out,err] = utils.git(["log","--max-count={0}".format(count),"--pretty=oneline"],cwd = SRC_PATH) [out,err] = utils.git(["log","--no-merges","--max-count={0}".format(count),"--pretty=oneline"],cwd = SRC_PATH)
log_entries = out.split("\n") log_entries = out.split("\n")
...@@ -850,7 +850,7 @@ def checkLatestCommits(): ...@@ -850,7 +850,7 @@ def checkLatestCommits():
global latest_commit_id_tested global latest_commit_id_tested
out = utils.git(["log", re.sub(r"[\W]",'',latest_commit_id_tested) + "..HEAD",'--pretty=format:"%H"'], cwd=SRC_PATH) out = utils.git(["log","--no-merges", re.sub(r"[\W]",'',latest_commit_id_tested) + "..HEAD",'--pretty=format:"%H"'], cwd=SRC_PATH)
commits_not_tested = [] commits_not_tested = []
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment