diff options
| author | Markus Duft <markus.duft@ssi-schaefer.com> | 2018-03-02 10:11:42 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2018-03-03 11:39:43 +0100 |
| commit | d3ed64bcd467e3e8976b018095e71ed3e3033eae (patch) | |
| tree | 8593dfe6131b1d3f890ebc92b3a78dead4c15e4d /org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm | |
| parent | 169de08a789b6fc1eb25350e49f4904e11f732cf (diff) | |
| download | jgit-d3ed64bcd467e3e8976b018095e71ed3e3033eae.tar.gz jgit-d3ed64bcd467e3e8976b018095e71ed3e3033eae.zip | |
LFS: support merge/rebase/cherry-pick/diff/compare with LFS files
Respect merge=lfs and diff=lfs attributes where required to replace (in
memory) the content of LFS pointers with the actual blob content from
the LFS storage (and vice versa when staging/merging).
Does not implement general support for merge/diff attributes for any
other use case apart from LFS.
Change-Id: Ibad8875de1e0bee8fe3a1dffb1add93111534cae
Signed-off-by: Markus Duft <markus.duft@ssi-schaefer.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm')
| -rw-r--r-- | org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Main.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Main.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Main.java index b29b097473..189a5acbf3 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Main.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Main.java @@ -65,8 +65,7 @@ import java.util.concurrent.TimeUnit; import org.eclipse.jgit.awtui.AwtAuthenticator; import org.eclipse.jgit.awtui.AwtCredentialsProvider; import org.eclipse.jgit.errors.TransportException; -import org.eclipse.jgit.lfs.CleanFilter; -import org.eclipse.jgit.lfs.SmudgeFilter; +import org.eclipse.jgit.lfs.BuiltinLFS; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.RepositoryBuilder; import org.eclipse.jgit.pgm.internal.CLIText; @@ -111,8 +110,7 @@ public class Main { */ public Main() { HttpTransport.setConnectionFactory(new HttpClientConnectionFactory()); - CleanFilter.register(); - SmudgeFilter.register(); + BuiltinLFS.register(); gcExecutor = Executors.newSingleThreadExecutor(new ThreadFactory() { private final ThreadFactory baseFactory = Executors .defaultThreadFactory(); |