diff options
| author | Thomas Wolf | 2018-02-12 08:40:41 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2018-05-05 23:19:18 +0000 |
| commit | 6209c97acc74faeae0f344af0ecf9e2922e63dbd (patch) | |
| tree | ac9b535f43558702d17e2b7ab05ae25b25cca16f /org.eclipse.egit.core/META-INF | |
| parent | 788e4174e4d4e04707c3de8fcdead4a00ad35e89 (diff) | |
| download | egit-6209c97acc74faeae0f344af0ecf9e2922e63dbd.tar.gz egit-6209c97acc74faeae0f344af0ecf9e2922e63dbd.tar.xz egit-6209c97acc74faeae0f344af0ecf9e2922e63dbd.zip | |
Respect gitattributes in the compare editor
Apply smudge/clean filters. Store the filters to be applied when
we create the internal GitBlobStorage and apply them when the stream
is opened. Unfortunately this requires quite a few interface changes
to pass through CheckoutMetadata.
Adds tests for the new behavior, including index edits.
Bug: 520693
Change-Id: If7696501f3e1b8f6d99518915b7292e268d656bd
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Diffstat (limited to 'org.eclipse.egit.core/META-INF')
| -rw-r--r-- | org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/org.eclipse.egit.core/META-INF/MANIFEST.MF b/org.eclipse.egit.core/META-INF/MANIFEST.MF index 80416eb747..3b6d568a20 100644 --- a/org.eclipse.egit.core/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core/META-INF/MANIFEST.MF @@ -22,6 +22,7 @@ Export-Package: org.eclipse.egit.core;version="5.0.0"; org.eclipse.egit.gitflow.ui, org.eclipse.mylyn.github.ui, org.eclipse.mylyn.github.core", + org.eclipse.egit.core.attributes;version="5.0.0", org.eclipse.egit.core.internal;version="5.0.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.import,org.eclipse.egit.gitflow.ui", org.eclipse.egit.core.internal.gerrit;version="5.0.0";x-friends:="org.eclipse.egit.ui", org.eclipse.egit.core.internal.indexdiff;version="5.0.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", @@ -50,6 +51,7 @@ Import-Package: com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)", org.eclipse.jgit.annotations;version="[5.0.0,5.1.0)", org.eclipse.jgit.api;version="[5.0.0,5.1.0)", org.eclipse.jgit.api.errors;version="[5.0.0,5.1.0)", + org.eclipse.jgit.attributes;version="[5.0.0,5.1.0)", org.eclipse.jgit.diff;version="[5.0.0,5.1.0)", org.eclipse.jgit.dircache;version="[5.0.0,5.1.0)", org.eclipse.jgit.errors;version="[5.0.0,5.1.0)", |