diff options
| author | Robin Stocker | 2011-08-18 07:41:24 +0000 |
|---|---|---|
| committer | Stefan Lay | 2011-08-18 07:41:24 +0000 |
| commit | 73aaf16642824de8ceabe004e365859851251c63 (patch) | |
| tree | 3cd4a5d4bd01c461d40f786f81fe33cf0900faa3 | |
| parent | 26b6ed6b391988e66f172301c38e1d0e33281a66 (diff) | |
| download | egit-73aaf16642824de8ceabe004e365859851251c63.tar.gz egit-73aaf16642824de8ceabe004e365859851251c63.tar.xz egit-73aaf16642824de8ceabe004e365859851251c63.zip | |
Use resource encoding in getFileCachedRevisionTypedElement
This fixes problems in compare actions that use index as base (Compare
index with HEAD, Staging View and Synchronize View).
When the workspace encoding is different from the encoding of the
resource, the index side of the diff would be decoded incorrectly (while
the other side would be decoded correctly), leading to spurious diffs.
Bug: 345160
Change-Id: If84334131ad53732aeac595e43ac0972de359628
Signed-off-by: Robin Stocker <robin@nibor.org>
| -rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/CompareUtils.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/CompareUtils.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/CompareUtils.java index 018e9a9427..3f68f818df 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/CompareUtils.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/CompareUtils.java @@ -320,7 +320,9 @@ public class CompareUtils { // check if file is staged if (entry != null) { - return new FileRevisionTypedElement(GitFileRevision.inIndex(db, gitPath)); + GitFileRevision nextFile = GitFileRevision.inIndex(db, gitPath); + String encoding = CompareCoreUtils.getResourceEncoding(db, gitPath); + return new FileRevisionTypedElement(nextFile, encoding); } } catch (IOException e) { Activator.error(NLS.bind(UIText.GitHistoryPage_errorLookingUpPath, |