summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorStephen Elsemore2013-06-18 11:34:05 (EDT)
committer Matthias Sohn2013-06-18 11:46:59 (EDT)
commitd09bab183cb4f497b3bdbd5d651a3b655ff2ea23 (patch)
treea26c49b2c48b19233f926e585e3e740e636a30cf
parent862e6ff22ad56c10df6de3385ffa4c7d02363d1d (diff)
downloadegit-d09bab183cb4f497b3bdbd5d651a3b655ff2ea23.zip
egit-d09bab183cb4f497b3bdbd5d651a3b655ff2ea23.tar.gz
egit-d09bab183cb4f497b3bdbd5d651a3b655ff2ea23.tar.bz2
Fix NPE when selecting filediff in a merge commitrefs/changes/75/13875/2
Bug: 411018 Change-Id: I94d2d15b8cbe1ab2ae0f0a4b4ea2da8dc7850670 Signed-off-by: Stephen Elsemore <selsemore@collab.net> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FileDiff.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FileDiff.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FileDiff.java
index 7c01b22..c5d4438 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FileDiff.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FileDiff.java
@@ -424,6 +424,11 @@ public class FileDiff extends WorkbenchAdapter {
}
@Override
+ public String getNewPath() {
+ return path;
+ }
+
+ @Override
public ChangeType getChange() {
return change;
}