diff options
author | Andrey Loskutov | 2015-09-01 21:15:17 +0000 |
---|---|---|
committer | Andrey Loskutov | 2015-09-01 21:15:17 +0000 |
commit | bafe324a79574a31a3c2584bdfbb608870146de8 (patch) | |
tree | 3b73dc3cf82ae209f09bc1ac5eaba7a0cf3504d0 /org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/DecoratableResourceMapping.java | |
parent | 6161f5074f5f7e766ba2f5e66b54bbd86dcfaec8 (diff) | |
download | egit-bafe324a79574a31a3c2584bdfbb608870146de8.tar.gz egit-bafe324a79574a31a3c2584bdfbb608870146de8.tar.xz egit-bafe324a79574a31a3c2584bdfbb608870146de8.zip |
Fixed error in decorator on bare repositories
Change-Id: I8270c843b7a2c447b5d56f996316c93ccf39e7f8
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
Diffstat (limited to 'org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/DecoratableResourceMapping.java')
-rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/DecoratableResourceMapping.java | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/DecoratableResourceMapping.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/DecoratableResourceMapping.java index 73065ff82e..79c50ba88a 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/DecoratableResourceMapping.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/DecoratableResourceMapping.java @@ -18,8 +18,10 @@ import java.util.Set; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.mapping.ResourceMapping; +import org.eclipse.core.runtime.IPath; import org.eclipse.egit.core.internal.indexdiff.IndexDiffData; import org.eclipse.egit.core.project.RepositoryMapping; +import org.eclipse.jdt.annotation.Nullable; import org.eclipse.jgit.lib.Repository; import org.eclipse.ui.IWorkingSet; @@ -78,7 +80,11 @@ public class DecoratableResourceMapping extends DecoratableResource { tracked = true; Repository repository = repoMapping.getRepository(); - String repoRelative = makeRepoRelative(repository, prj) + "/"; //$NON-NLS-1$ + String repoRelative = makeRepoRelative(repository, prj); + if (repoRelative == null) { + continue; + } + repoRelative += "/"; //$NON-NLS-1$ Set<String> modified = diffData.getModified(); Set<String> conflicting = diffData.getConflicting(); @@ -143,9 +149,16 @@ public class DecoratableResourceMapping extends DecoratableResource { return "<unknown>"; //$NON-NLS-1$ } + @Nullable private String makeRepoRelative(Repository repository, IResource res) { - return stripWorkDir(repository.getWorkTree(), res.getLocation() - .toFile()); + if (repository.isBare()) { + return null; + } + IPath location = res.getLocation(); + if (location == null) { + return null; + } + return stripWorkDir(repository.getWorkTree(), location.toFile()); } private boolean containsPrefix(Set<String> collection, String prefix) { |