Browse Source

Merge "Prevent NPE if ref can't be resolved when executing ReflogCommand" into stable-3.6

stable-3.6
Christian Halstrick 10 years ago committed by Gerrit Code Review @ Eclipse.org
parent
commit
c893534059
  1. 4
      org.eclipse.jgit/src/org/eclipse/jgit/api/ReflogCommand.java

4
org.eclipse.jgit/src/org/eclipse/jgit/api/ReflogCommand.java

@ -48,6 +48,7 @@ import java.util.Collection;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.api.errors.InvalidRefNameException;
import org.eclipse.jgit.api.errors.RefNotFoundException;
import org.eclipse.jgit.internal.JGitText;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.ReflogEntry;
@ -97,6 +98,9 @@ public class ReflogCommand extends GitCommand<Collection<ReflogEntry>> {
try {
ReflogReader reader = repo.getReflogReader(ref);
if (reader == null)
throw new RefNotFoundException(MessageFormat.format(
JGitText.get().refNotResolved, ref));
return reader.getReverseEntries();
} catch (IOException e) {
throw new InvalidRefNameException(MessageFormat.format(

Loading…
Cancel
Save