Commit 9fc50db2 authored by tandrii@chromium.org's avatar tandrii@chromium.org

Gerrit git cl: fix change-id appending.

Special case when the change description has no footers, but looks
like a footer.

R=machenbach@chromium.org,andybons@chromium.org
BUG=579176

Review URL: https://codereview.chromium.org/1812803002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@299343 0039d316-1c4b-4281-b951-d872f2087c98
parent 29c3b346
......@@ -83,9 +83,13 @@ def add_footer_change_id(message, change_id):
if line == '' or line.isspace():
break
footer_lines.append(line)
else:
# The whole description was consisting of footers,
# which means those aren't footers.
footer_lines = []
# footers order is from end to start of the message.
footers = map(parse_footer, footer_lines)
if not all(footers):
if not footers or not all(footers):
lines.append('')
lines.append(change_id_line)
else:
......
......@@ -99,6 +99,11 @@ My commit message is my best friend. It is my life. I must master it.
git_footers.add_footer_change_id('header\n\nBUG: yy\n\nPos: 1', 'Ixxx'),
'header\n\nBUG: yy\n\nChange-Id: Ixxx\nPos: 1')
# Special case: first line is never a footer, even if it looks line one.
self.assertEqual(
git_footers.add_footer_change_id('header: like footer', 'Ixxx'),
'header: like footer\n\nChange-Id: Ixxx')
if __name__ == '__main__':
unittest.main()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment