Merge branch 'stable-3.0' into stable-3.1
* stable-3.0:
PushOne: Log when skipping deletion of ref
Change-Id: I9ae39ad91f7e6d05d1e9d63b65afe4a05aa6f8f2
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java b/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java
index 4be2742..17fb6c0 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java
@@ -549,12 +549,14 @@
if (config.isMirror()) {
for (Ref ref : remote.values()) {
- if (!Constants.HEAD.equals(ref.getName())) {
- RefSpec spec = matchDst(ref.getName());
- if (spec != null && !local.containsKey(spec.getSource())) {
- // No longer on local side, request removal.
- delete(cmds, spec);
- }
+ if (Constants.HEAD.equals(ref.getName())) {
+ repLog.atFine().log("Skipping deletion of %s", ref.getName());
+ continue;
+ }
+ RefSpec spec = matchDst(ref.getName());
+ if (spec != null && !local.containsKey(spec.getSource())) {
+ // No longer on local side, request removal.
+ delete(cmds, spec);
}
}
}