From f1ca8ee1f55373d39556ce4b227d9c23ec4350c0 Mon Sep 17 00:00:00 2001 From: Andrey Loskutov Date: Thu, 16 Mar 2017 10:20:40 +0100 Subject: [PATCH] Revert "Fix NPE in FetchGerritChangePage" This reverts commit 029ac157325637aa2e353f4359973d385c558d72. Bug: 513673 Change-Id: If2ee7274ae0e0493265eb3cb967c8936322e3e06 Signed-off-by: Andrey Loskutov --- .../org/eclipse/egit/ui/internal/fetch/FetchGerritChangePage.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchGerritChangePage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchGerritChangePage.java index fb751ff50..640041f4e 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchGerritChangePage.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchGerritChangePage.java @@ -611,7 +611,7 @@ public class FetchGerritChangePage extends WizardPage { } } - private @Nullable Ref getLocalRef(String ref) { + private Ref getLocalRef(String ref) { Change change = Change.fromRef(ref); if (change != null) { try { @@ -757,9 +757,7 @@ public class FetchGerritChangePage extends WizardPage { if (doChangeBranch) { Ref localRef = getLocalRef(spec.getSource()); - if (localRef != null) { - checkout(localRef.getName(), monitor); - } + checkout(localRef.getName(), monitor); } else { try { RevCommit commit = fetchChange(uri, spec, monitor); -- 2.11.4.GIT