Browse Source

Handles repo manifest file without default remote.

Change-Id: Ic45919a0b695e8a6f4ed47cc060e0c41f1d7e7ea
Signed-off-by: Yuxuan 'fishy' Wang <fishywang@google.com>
stable-3.5
Yuxuan 'fishy' Wang 10 years ago
parent
commit
684a2a058a
  1. 20
      org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java

20
org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java

@ -473,14 +473,8 @@ public class RepoCommand extends GitCommand<RevCommit> {
xmlInRead--; xmlInRead--;
if (xmlInRead != 0) if (xmlInRead != 0)
return; return;
// Only do the following after we finished reading everything. // Only do the following after we finished reading everything.
if (defaultRemote == null) {
if (filename != null)
throw new SAXException(MessageFormat.format(
RepoText.get().errorNoDefaultFilename, filename));
else
throw new SAXException(RepoText.get().errorNoDefault);
}
removeNotInGroup(); removeNotInGroup();
removeOverlaps(); removeOverlaps();
@ -493,8 +487,18 @@ public class RepoCommand extends GitCommand<RevCommit> {
} }
for (Project proj : projects) { for (Project proj : projects) {
String remote = proj.remote; String remote = proj.remote;
if (remote == null) if (remote == null) {
if (defaultRemote == null) {
if (filename != null)
throw new SAXException(MessageFormat.format(
RepoText.get().errorNoDefaultFilename,
filename));
else
throw new SAXException(
RepoText.get().errorNoDefault);
}
remote = defaultRemote; remote = defaultRemote;
}
String remoteUrl = remoteUrls.get(remote); String remoteUrl = remoteUrls.get(remote);
if (remoteUrl == null) { if (remoteUrl == null) {
remoteUrl = baseUri.resolve(remotes.get(remote)).toString(); remoteUrl = baseUri.resolve(remotes.get(remote)).toString();

Loading…
Cancel
Save