summaryrefslogtreecommitdiff
path: root/usr/src/tools/scripts/git-pbchk.py
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/tools/scripts/git-pbchk.py')
-rw-r--r--usr/src/tools/scripts/git-pbchk.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/src/tools/scripts/git-pbchk.py b/usr/src/tools/scripts/git-pbchk.py
index 74be6a4818..656e22f6b4 100644
--- a/usr/src/tools/scripts/git-pbchk.py
+++ b/usr/src/tools/scripts/git-pbchk.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python2.6
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2
@@ -140,13 +140,13 @@ def git_parent_branch(branch):
def git_comments(parent):
"""Return a list of any checkin comments on this git branch"""
- p = git('log --pretty=format:%%B %s..' % parent)
+ p = git('log --pretty=tformat:%%B:SEP: %s..' % parent)
if not p:
sys.stderr.write("Failed getting git comments\n")
sys.exit(err)
- return map(lambda x: x.strip(), p.readlines())
+ return [x.strip() for x in p.readlines() if x != ':SEP:\n']
def git_file_list(parent, paths=None):