opendev/gerrit
Code Issues Proposed changes

Merge "Fix: Inconsistent behaviour when replicating refs/meta/config"

Browse Source
This commit is contained in:
Shawn Pearce
2012-05-03 14:10:37 -07:00
committed by gerrit code review
parent faaf5b823d c8feec1efc
commit f588cb12ca
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gerrit-server/src/main/java/com/google/gerrit/server/git/PushOp.java
View File

@@ -343,10 +343,6 @@ class PushOp implements ProjectRunnable {
if (config.isMirror()) { if (config.isMirror()) {
for (final Ref ref : remote.values()) { for (final Ref ref : remote.values()) {
if (noPerms && GitRepositoryManager.REF_CONFIG.equals(ref.getName())) {
continue;
}
if (!Constants.HEAD.equals(ref.getName())) { if (!Constants.HEAD.equals(ref.getName())) {
final RefSpec spec = matchDst(ref.getName()); final RefSpec spec = matchDst(ref.getName());
if (spec != null && !local.containsKey(spec.getSource())) { if (spec != null && !local.containsKey(spec.getSource())) {
@@ -360,16 +356,13 @@ class PushOp implements ProjectRunnable {
} else { } else {
for (final String src : delta) { for (final String src : delta) {
if (noPerms && GitRepositoryManager.REF_CONFIG.equals(src)) {
continue;
}
final RefSpec spec = matchSrc(src); final RefSpec spec = matchSrc(src);
if (spec != null) { if (spec != null) {
// If the ref still exists locally, send it, otherwise delete it. // If the ref still exists locally, send it, otherwise delete it.
// //
Ref srcRef = local.get(src); Ref srcRef = local.get(src);
if (srcRef != null) { if (srcRef != null &&
!(noPerms && GitRepositoryManager.REF_CONFIG.equals(src))) {
send(cmds, spec, srcRef); send(cmds, spec, srcRef);
} else if (config.isMirror()) { } else if (config.isMirror()) {
delete(cmds, spec); delete(cmds, spec);