]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 80fa5f3) | patch
Fix calling of clean/smudge filters from Checkout,MergeCommands 33/70833/3
authorChristian Halstrick <christian.halstrick@sap.com>
Tue, 12 Apr 2016 12:38:37 +0000 (14:38 +0200)
committerChristian Halstrick <christian.halstrick@sap.com>
Fri, 22 Apr 2016 07:32:34 +0000 (09:32 +0200)
commit22d7ec2971edf8d375c4fc9ef9d92526bad73626
treea14c398c8b5316777ec4ffe53c86be857a77b1ddtree | snapshot
parent80fa5f39f9d3b742e34b4baad019d917ff19f318commit | diff
Fix calling of clean/smudge filters from Checkout,MergeCommands

When CheckoutCommand or MergeCommand is called then not in all situation
the treewalks have been prepared to support clean/smudge filters. Fix
this

Bug: 491505
Change-Id: Iab5608049221c46d06812552ab97299e44d59e64
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CheckoutCommandTest.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
org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategySimpleTwoWayInCore.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit