]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: aeb28b1) | patch
Teach ResolveMerger to create more correct DirCacheEntry's 46/6646/8
authorMarkus Duft <markus.duft@salomon.at>
Tue, 17 Jul 2012 16:32:38 +0000 (18:32 +0200)
committerChristian Halstrick <christian.halstrick@sap.com>
Thu, 19 Jul 2012 08:30:59 +0000 (10:30 +0200)
commit3ea694c2523d909190b5350e13254a62e94ec5d5
tree2300dc1a49a79d291c9392f844f402d2387385a3tree | snapshot
parentaeb28b1f3e8763c006dd26e690fbcad0920bc1a4commit | diff
Teach ResolveMerger to create more correct DirCacheEntry's

Currently, after a merge/cherry-pick/rebase, all index entries are
smudged as the ResolveMerger never sets entry lengths and/or
modification times. This change teaches it to re-set them at least for
things it did not touch. The other entries are then repaired when the
index is persisted, or entries are checked out.

Change-Id: I0944f2017483d32043d0d09409b13055b5609a4b
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
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