]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: bd1a825) | patch
Fix ResolveMerger: rebase with autocrlf=true, direct checkout 90/127290/3
authorThomas Wolf <thomas.wolf@paranor.ch>
Fri, 10 Aug 2018 09:11:50 +0000 (11:11 +0200)
committerThomas Wolf <thomas.wolf@paranor.ch>
Mon, 13 Aug 2018 11:15:24 +0000 (13:15 +0200)
commit4027c5c9ffc9fb99b2c06b9a7ecdeb18838e8218
tree451576c74710fc3f6e522ea6f22172e530f5317atree | snapshot
parentbd1a82502680b5de5bf86f6c4470185fd1602386commit | diff
Fix ResolveMerger: rebase with autocrlf=true, direct checkout

ResolveMerger.checkout() and cleanUp() check out files directly and
must honor CR/LF settings and also smudge filters.

Deprecate the 3-argument version of DirCacheCheckout.checkoutEntry().
It isn't used anymore anywhere in JGit (nor in EGit).

Bug: 537410
Change-Id: I062b35401c8bd5bc99deb2f68f91089a0643504c
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergerTest.java diff | blob | history
org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorTest.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit