From bbc7deb76f2d32a86a753594d7ef59a2123e5c24 Mon Sep 17 00:00:00 2001
From: Daniel Brown <ddb@star.sr.bham.ac.uk>
Date: Mon, 23 Sep 2013 14:43:08 +0100
Subject: [PATCH] stopping merges from appearing in test commit lists
---
pykat/testing/web/web_interface.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pykat/testing/web/web_interface.py b/pykat/testing/web/web_interface.py
index 841ef50..086e885 100644
--- a/pykat/testing/web/web_interface.py
+++ b/pykat/testing/web/web_interface.py
@@ -492,7 +492,7 @@ def finesse_get_log(count,branch):
except Exception as 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")
@@ -850,7 +850,7 @@ def checkLatestCommits():
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 = []
--
GitLab