opendev/gerrit
Code Issues Proposed changes

Always trim Change-Id lines to handle non-standard whitespace

Browse Source 
A user might copy-and-paste a Change-Id line from the little info
table on the web, which usually brings in a tab rather than a space
between the tag and the identity.  So we would see [1] instead of
seeing the more typical string [2].

 [1] "Change-Id:\tIdeadbeef...\n"
 [2] "Change-Id: Ideadbeef...\n".

Prior to this bug fix we were trimming during insertion of a new
change into the database, but we did not trim when querying to
look for replacement or merge candidates.  This could lead the same
Change-Id showing up twice in the database.

Change-Id: Ia90b894eda545abf0b976b1610ae68bb4147d963
Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce
2009-12-04 18:44:23 -08:00
parent e529c0fab7
commit 1a9029b006
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Receive.java
View File

@@ -722,7 +722,8 @@ final class Receive extends AbstractGitCommand {
final List<String> idList = c.getFooterLines(CHANGE_ID); final List<String> idList = c.getFooterLines(CHANGE_ID);
if (!idList.isEmpty()) { if (!idList.isEmpty()) {
final Change.Key key = new Change.Key(idList.get(idList.size() - 1)); final String idStr = idList.get(idList.size() - 1).trim();
final Change.Key key = new Change.Key(idStr);
final List<Change> changes = final List<Change> changes =
db.changes().byProjectKey(project.getNameKey(), key).toList(); db.changes().byProjectKey(project.getNameKey(), key).toList();
if (changes.size() > 1) { if (changes.size() > 1) {
@@ -1275,7 +1276,7 @@ final class Receive extends AbstractGitCommand {
rw.parseBody(c); rw.parseBody(c);
for (final String changeId : c.getFooterLines(CHANGE_ID)) { for (final String changeId : c.getFooterLines(CHANGE_ID)) {
final Change.Id onto = byKey.get(new Change.Key(changeId)); final Change.Id onto = byKey.get(new Change.Key(changeId.trim()));
if (onto != null) { if (onto != null) {
toClose.add(new ReplaceRequest(onto, c, cmd)); toClose.add(new ReplaceRequest(onto, c, cmd));
break; break;