opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14'

Browse Source 
* stable-2.14:
  Set reflog message and identity when merging change

Change-Id: Ia7c856fe081d674c886ae983d59ce89fc9a5fe9b
This commit is contained in:
David Pursehouse
2017-06-20 10:33:15 +09:00
parent 29d84e2a57 64d7c00540
commit 75762be14e
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOpRepoManager.java
View File

@@ -204,7 +204,7 @@ public class MergeOpRepoManager implements AutoCloseable {
throws NoSuchProjectException, IOException {
List<BatchUpdate> updates = new ArrayList<>(projects.size());
for (Project.NameKey project : projects) {
updates.add(getRepo(project).getUpdate(batchUpdateFactory));
updates.add(getRepo(project).getUpdate(batchUpdateFactory).setRefLogMessage("merged"));
}
return updates;
}

3
gerrit-server/src/main/java/com/google/gerrit/server/update/ReviewDbBatchUpdate.java
View File

@@ -416,6 +416,9 @@ class ReviewDbBatchUpdate extends BatchUpdate {
batchRefUpdate.setRefLogMessage(refLogMessage, true);
batchRefUpdate.setAllowNonFastForwards(true);
repoView.getCommands().addTo(batchRefUpdate);
if (user.isIdentifiedUser()) {
batchRefUpdate.setRefLogIdent(user.asIdentifiedUser().newRefLogIdent(when, tz));
}
logDebug("Executing batch of {} ref updates", batchRefUpdate.getCommands().size());
if (dryrun) {
return;