]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3ea694c) | patch
Revert "Teach ResolveMerger to create more correct DirCacheEntry's" 53/6953/1
authorShawn Pearce <sop@google.com>
Wed, 25 Jul 2012 00:07:48 +0000 (20:07 -0400)
committerGerrit Code Review @ Eclipse.org <gerrit@eclipse.org>
Wed, 25 Jul 2012 00:07:48 +0000 (20:07 -0400)
commit955b024995a423c32154b73f99cff606d882bbe4
tree98d8c77094ba012226e9f079fe4a50e011db1012tree | snapshot
parent3ea694c2523d909190b5350e13254a62e94ec5d5commit | diff
Revert "Teach ResolveMerger to create more correct DirCacheEntry's"

This reverts commit 3ea694c2523d909190b5350e13254a62e94ec5d5

Merges with unmodified subtrees are broken with this commit present.
Back it out until a fixed version can be supplied.
org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RepositoryTestCase.java diff | blob | history
org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.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