diff options
| author | Andrey Loskutov | 2015-06-20 08:38:23 +0000 |
|---|---|---|
| committer | Andrey Loskutov | 2015-06-20 08:38:23 +0000 |
| commit | 098842ff91e1f12e48afa34371a42521cab356a4 (patch) | |
| tree | 9f17aa08f20af34ec96f572fb7af135a22e6b8ec | |
| parent | 0d685204739b0a4d451d1be846df712d5b314ed3 (diff) | |
| download | egit-098842ff91e1f12e48afa34371a42521cab356a4.tar.gz egit-098842ff91e1f12e48afa34371a42521cab356a4.tar.xz egit-098842ff91e1f12e48afa34371a42521cab356a4.zip | |
Immediately set repo on reload and avoid NPE's in getHeadCommitInfo()
Bug: 470640
Change-Id: Ic8d6a65a11a58f4c088c51aecae6c0631e943008
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
| -rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageComponent.java | 3 | ||||
| -rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageComponent.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageComponent.java index 8147136922..010639486f 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageComponent.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageComponent.java @@ -623,6 +623,9 @@ public class CommitMessageComponent { private void getHeadCommitInfo() { CommitInfo headCommitInfo = CommitHelper.getHeadCommitInfo(repository); + if (headCommitInfo == null) { + return; + } RevCommit previousCommit = headCommitInfo.getCommit(); amendingCommitInRemoteBranch = isContainedInAnyRemoteBranch(previousCommit); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java index 82bd619810..29dc4dab8b 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java @@ -2374,6 +2374,7 @@ public class StagingView extends ViewPart implements IShowInSource { } final boolean repositoryChanged = currentRepository != repository; + currentRepository = repository; asyncExec(new Runnable() { @@ -2410,7 +2411,7 @@ public class StagingView extends ViewPart implements IShowInSource { }); } - final StagingViewUpdate update = new StagingViewUpdate(currentRepository, indexDiff, null); + final StagingViewUpdate update = new StagingViewUpdate(repository, indexDiff, null); Object[] unstagedExpanded = unstagedViewer .getExpandedElements(); Object[] stagedExpanded = stagedViewer @@ -2450,9 +2451,8 @@ public class StagingView extends ViewPart implements IShowInSource { } private IndexDiffData doReload(final Repository repository) { - currentRepository = repository; - - IndexDiffCacheEntry entry = org.eclipse.egit.core.Activator.getDefault().getIndexDiffCache().getIndexDiffCacheEntry(currentRepository); + IndexDiffCacheEntry entry = org.eclipse.egit.core.Activator.getDefault() + .getIndexDiffCache().getIndexDiffCacheEntry(repository); if(cacheEntry != null && cacheEntry != entry) cacheEntry.removeIndexDiffChangedListener(myIndexDiffListener); |