opendev/gerrit
Code Issues Proposed changes

Merge "Fix: Change closes when pushing commit to other branch."

Browse Source
This commit is contained in:
Shawn Pearce
2012-12-21 14:13:59 -08:00
committed by Gerrit Code Review
parent 1c27bc4e09 54fa7f456b
commit 29b05b873d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2333,10 +2333,10 @@ public class ReceiveCommits {
} }
if (change.getStatus() == Change.Status.MERGED || if (change.getStatus() == Change.Status.MERGED ||
change.getStatus() == Change.Status.ABANDONED) { change.getStatus() == Change.Status.ABANDONED ||
// If its already merged, don't make further updates, it !change.getDest().get().equals(refName)) {
// might just be moving from an experimental branch into // If it's already merged or the commit is not aimed for
// a more stable branch. // this change's destination, don't make further updates.
// //
return null; return null;
} }