diff options
| author | Richard Lowe <richlowe@richlowe.net> | 2012-10-18 16:38:42 +0000 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2012-10-19 21:01:23 -0400 |
| commit | 27495383ee5e81658b2c3bbd8f51f5b0dddeb3d8 (patch) | |
| tree | a8573098809ac00e13e7a675f1098ff843d30cfd /usr/src/tools/scripts/git-pbchk.py | |
| parent | d23589482994f9ec7e17f81415324eea6e26d015 (diff) | |
| download | illumos-joyent-27495383ee5e81658b2c3bbd8f51f5b0dddeb3d8.tar.gz | |
3288 git-pbchk invents blank lines, then complains about them
Reviewed by: Joshua M. Clulow <josh@sysmgr.org>
Reviewed by: Gordon Ross <gwr@nexenta.com>
Approved by: Dan McDonald <danmcd@nexenta.com>
Diffstat (limited to 'usr/src/tools/scripts/git-pbchk.py')
| -rw-r--r-- | usr/src/tools/scripts/git-pbchk.py | 4 |
1 files 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): |