| commit | e5f095994caafb2eb5b8ec724dc00fc8f09ca5bf | |
| author | Thomas Wolf <thomas.wolf@paranor.ch> | |
| Fri, 13 Jan 2017 18:46:48 +0000 (13 19:46 +0100) | ||
| committer | Thomas Wolf <thomas.wolf@paranor.ch> | |
| Fri, 13 Jan 2017 18:47:02 +0000 (13 19:47 +0100) | ||
| tree | 240b7dac84a0488f75dcef5773df0bd34f1b4a85 | treesnapshot (tar.gz zip) |
| parent | 06b3cee7d8412db8338d2086b9d12f9c88f8d0e8 | commitdiff |
Regression fix: display of diff for stashes
Commit e5054ed2 fixed an NPE when trying to show a diff for a merge
commit by suppressing the diff and displaying an error message instead
for commits with more than one parent. Stashes also have more than one
parent (index and HEAD), but for those we can actually display a diff.
Adapt the check to account for stashes.
Change-Id: Ie0ff5ac2ea87c74d4523894e7b77177c35ac8779
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Commit e5054ed2 fixed an NPE when trying to show a diff for a merge
commit by suppressing the diff and displaying an error message instead
for commits with more than one parent. Stashes also have more than one
parent (index and HEAD), but for those we can actually display a diff.
Adapt the check to account for stashes.
Change-Id: Ie0ff5ac2ea87c74d4523894e7b77177c35ac8779
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
| org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/DiffEditorPage.java | diffblobblamehistory |