From 27495383ee5e81658b2c3bbd8f51f5b0dddeb3d8 Mon Sep 17 00:00:00 2001 From: Richard Lowe Date: Thu, 18 Oct 2012 16:38:42 +0000 Subject: [PATCH] 3288 git-pbchk invents blank lines, then complains about them Reviewed by: Joshua M. Clulow Reviewed by: Gordon Ross Approved by: Dan McDonald --- usr/src/tools/scripts/git-pbchk.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr/src/tools/scripts/git-pbchk.py b/usr/src/tools/scripts/git-pbchk.py index 98a5c8628d..656e22f6b4 100644 --- a/usr/src/tools/scripts/git-pbchk.py +++ b/usr/src/tools/scripts/git-pbchk.py @@ -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): -- 2.11.4.GIT