Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wolf2018-02-12 03:40:41 -0500
committerMatthias Sohn2018-05-05 19:19:18 -0400
commit6209c97acc74faeae0f344af0ecf9e2922e63dbd (patch)
treeac9b535f43558702d17e2b7ab05ae25b25cca16f /org.eclipse.egit.ui.test/META-INF
parent788e4174e4d4e04707c3de8fcdead4a00ad35e89 (diff)
downloadegit-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.ui.test/META-INF')
-rw-r--r--org.eclipse.egit.ui.test/META-INF/MANIFEST.MF1
1 files changed, 1 insertions, 0 deletions
diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF
index eaa274870..9515059e6 100644
--- a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF
@@ -27,6 +27,7 @@ Import-Package: org.eclipse.core.net.proxy;bundle-version="[1.1.0,2.0.0)",
org.eclipse.egit.gitflow.ui.internal.actions;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.junit;version="[5.0.0,5.1.0)",
org.eclipse.jgit.junit.http;version="[5.0.0,5.1.0)",
org.eclipse.jgit.lib;version="[5.0.0,5.1.0)",

Back to the top