Browse Source

Merge "Fix NullPointer when pulling from a deleted local branch"

stable-0.12
Shawn Pearce 14 years ago committed by Code Review
parent
commit
c13bf05754
  1. 5
      org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java

5
org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java

@ -138,7 +138,7 @@ public class PullCommand extends GitCommand<PullResult> {
*/
public PullResult call() throws WrongRepositoryStateException,
InvalidConfigurationException, DetachedHeadException,
InvalidRemoteException, CanceledException {
InvalidRemoteException, CanceledException, RefNotFoundException {
checkCallable();
monitor.beginTask(JGitText.get().pullTaskName, 2);
@ -248,6 +248,9 @@ public class PullCommand extends GitCommand<PullResult> {
} else {
try {
commitToMerge = repo.resolve(remoteBranchName);
if (commitToMerge == null)
throw new RefNotFoundException(MessageFormat.format(
JGitText.get().refNotResolved, remoteBranchName));
} catch (IOException e) {
throw new JGitInternalException(
JGitText.get().exceptionCaughtDuringExecutionOfPullCommand,

Loading…
Cancel
Save