diff options
| author | Stephen Elsemore | 2013-06-18 15:34:05 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2013-08-22 22:06:58 +0000 |
| commit | 1c1168a538424f1ab205cc258b5e0aef277f16d8 (patch) | |
| tree | 1164bf886767891cb3f5374b86d2ab66e6ac48b5 | |
| parent | b979ed0b84ee83c01b6ccd9c6ea27c5f1493cfe0 (diff) | |
| download | egit-1c1168a538424f1ab205cc258b5e0aef277f16d8.tar.gz egit-1c1168a538424f1ab205cc258b5e0aef277f16d8.tar.xz egit-1c1168a538424f1ab205cc258b5e0aef277f16d8.zip | |
Fix NPE when selecting filediff in a merge commit
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.java | 5 |
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 7c01b22883..c5d443833d 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; } |