]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: dd1e66e) | patch
Enable DirCacheEntry's copyMetaData to not copy stage info 93/5493/5
authorRobin Rosenberg <robin.rosenberg@dewire.com>
Fri, 13 Apr 2012 22:40:06 +0000 (00:40 +0200)
committerChristian Halstrick <christian.halstrick@sap.com>
Tue, 17 Apr 2012 07:51:03 +0000 (09:51 +0200)
commit95ed300b04f52e6d0625dfb5a6e0e52aac4bc412
tree8cce3f161218076b3fc0c567bb32aff88f96a9bftree | snapshot
parentdd1e66e1d7f346f6e16e30c209497b436d00a69ecommit | diff
Enable DirCacheEntry's copyMetaData to not copy stage info

When there is a conflict sometimes we did not set the stage of
the conflict entries properly for the STAGE_1 entry.

Change-Id: I1c28ff6251fdbc95f7c40fc3e401f1b41157a9f6
org.eclipse.jgit.test/tst/org/eclipse/jgit/dircache/DirCacheEntryTest.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheEntry.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit