x
/
git-upstream
Code Issues Proposed changes

Fix filtering regex for superseded commits 

This also fixes a failing functional test

Change-Id: I50a8e197e3b74768b9aaf36bf5e8e7fb58fccbbf
This commit is contained in:
Davide Guerri 2014-02-24 18:41:14 +00:00
parent 83c7531bd0
commit 59a131eda5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ghp/lib/searchers.py
View File

@ -469,7 +469,7 @@ class SupersededCommitFilter(LogDedentMixin, GitMixin, CommitFilter):
# search for all the change-ids in matches (egrep regex)
commits_grep_re = '^Change-Id:\\s*\(%s\)\\s*$' % \
'|'.join(superseding_change_ids)
'\|'.join(superseding_change_ids)
# retrieve all matching commits because we need to check
# each match for whether the changeId is actually in
@ -494,7 +494,7 @@ class SupersededCommitFilter(LogDedentMixin, GitMixin, CommitFilter):
found:
%s
""", commit.hexsha[:7], commit.message.splitlines()[0],
'\n'.join(superseding_change_ids))
'\n '.join(superseding_change_ids))
yield commit
continue