diff options
| author | James Moger <james.moger@gitblit.com> | 2012-03-23 16:35:48 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2012-03-23 16:35:48 -0400 |
| commit | 5b29c53b326b5fd283cb06356e94df5f78508860 (patch) | |
| tree | b62fbea48920abc8f87e20388bf9a1c11adbb1bd | |
| parent | ed295f8a491895081f4d20c0f2397aedd7ce16f6 (diff) | |
| download | gitblit-5b29c53b326b5fd283cb06356e94df5f78508860.tar.gz gitblit-5b29c53b326b5fd283cb06356e94df5f78508860.zip | |
Update indexed branches on federation pull
| -rw-r--r-- | src/com/gitblit/FederationPullExecutor.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/com/gitblit/FederationPullExecutor.java b/src/com/gitblit/FederationPullExecutor.java index 0fd1355f..10f69d2f 100644 --- a/src/com/gitblit/FederationPullExecutor.java +++ b/src/com/gitblit/FederationPullExecutor.java @@ -272,6 +272,17 @@ public class FederationPullExecutor implements Runnable { 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
|