motiejus
/
jgit
1
Fork 0
Code Releases Activity

PullCommand: use default remote instead of throwing Exception 

When pulling into a local branch that has no upstream configuration,
pull should try to used the default remote ("origin") instead of
throwing an Exception.

Bug: 336504
Change-Id: Ife75858e89ea79c0d6d88ba73877fe8400448e34
Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
This commit is contained in:
Mathias Kinzler 2011-02-08 08:56:19 +01:00
parent 0180946bc8
commit 724af77c65
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java
View File

@ -166,15 +166,12 @@ public PullResult call() throws WrongRepositoryStateException,
// get the configured remote for the currently checked out branch
// stored in configuration key branch.<branch name>.remote
Config repoConfig = repo.getConfig();
final String remote = repoConfig.getString(
String remote = repoConfig.getString(
ConfigConstants.CONFIG_BRANCH_SECTION, branchName,
ConfigConstants.CONFIG_KEY_REMOTE);
if (remote == null) {
String missingKey = ConfigConstants.CONFIG_BRANCH_SECTION + DOT
+ branchName + DOT + ConfigConstants.CONFIG_KEY_REMOTE;
throw new InvalidConfigurationException(MessageFormat.format(
JGitText.get().missingConfigurationForKey, missingKey));
}
if (remote == null)
// fall back to default remote
remote = Constants.DEFAULT_REMOTE_NAME;
// get the name of the branch in the remote repository
// stored in configuration key branch.<branch name>.merge