James Moger
2012-03-23 5b29c53b326b5fd283cb06356e94df5f78508860
Update indexed branches on federation pull
1 files modified
11 ■■■■■ changed files
src/com/gitblit/FederationPullExecutor.java 11 ●●●●● patch | view | raw | blame | history
src/com/gitblit/FederationPullExecutor.java
@@ -272,6 +272,17 @@
                    federationSets.addAll(repository.federationSets);
                }
                repository.federationSets = new ArrayList<String>(federationSets);
                // merge indexed branches
                Set<String> indexedBranches = new HashSet<String>();
                if (rm.indexedBranches != null) {
                    indexedBranches.addAll(rm.indexedBranches);
                }
                if (repository.indexedBranches != null) {
                    indexedBranches.addAll(repository.indexedBranches);
                }
                repository.indexedBranches = new ArrayList<String>(indexedBranches);
            }
            // only repositories that are actually _cloned_ from the origin
            // Gitblit repository are marked as federated. If the origin