commit e8a816c2e873d5d0db507df547b85dcf6f43b3e1
author Shawn Pearce <sop@google.com> Tue Jun 04 11:39:31 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 04 11:39:32 2013 +0000
tree 4d99c1fa1b8c73ed6beb3f496c4e1b08b841e38a
parent 75d549f022359990339b631258191eb355e2825d
parent 940397b357f031e6a73fc2580cf84f4a16f4a2c9

Merge "Fix: 'change_key' of current patchset pushed by 'refs/changes' is still old one." into stable-2.6

gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
index a5478ab..0a52782 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
@@ -1810,6 +1810,14 @@
                   }
                   change.setLastSha1MergeTested(null);
                   change.setCurrentPatchSet(info);
+
+                  final List<String> idList = newCommit.getFooterLines(CHANGE_ID);
+                  if (idList.isEmpty()) {
+                    change.setKey(new Change.Key("I" + newCommit.name()));
+                  } else {
+                    change.setKey(new Change.Key(idList.get(idList.size() - 1).trim()));
+                  }
+
                   ChangeUtil.updated(change);
                   return change;
                 }