diff options
Diffstat (limited to 'org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/command/RevertHandler.java')
-rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/command/RevertHandler.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/command/RevertHandler.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/command/RevertHandler.java index ec0e792019..c1de1a9dd9 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/command/RevertHandler.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/command/RevertHandler.java @@ -30,6 +30,7 @@ import org.eclipse.egit.ui.internal.commit.RepositoryCommit; import org.eclipse.egit.ui.internal.dialogs.RevertFailureDialog; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jgit.api.MergeResult; +import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; @@ -101,9 +102,12 @@ public class RevertHandler extends CommitCommandHandler { } private boolean contains(List<Ref> refs, RevCommit commit) { - for (Ref ref : refs) - if (ref.getObjectId().equals(commit.getId())) + for (Ref ref : refs) { + ObjectId objectId = ref.getObjectId(); + if (objectId != null && objectId.equals(commit.getId())) { return true; + } + } return false; } |