mirrors/jgit - jgit - source @ dussan.org

Vēsture

Thomas Wolf e84881ea6b Allow to resolve a conflict by checking out a file DirCacheEditor unconditionally applied a PathEdit to all stages in the index. This gives wrong results if one wants to check out a file from some commit to resolve a conflict: JGit would update the working tree file multiple times (once per stage), and set all stages to point to the checked-out blob. C git replaces the stages by the entry for the checked-out file. To support this, add a DirCacheEntry.setStage() method so that CheckoutCommand can force the stage to zero. In DirCacheEditor, keep only the zero stage if the PathEdit re-set the stage. Bug: 568038 Change-Id: Ic7c635bb5aaa06ffaaeed50bc5e45702c56fc6d1 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>		pirms 3 gadiem
..
DirCacheAfterCloneTest.java	DirCache: support index V4	pirms 3 gadiem
DirCacheBasicTest.java	Update EDL 1.0 license headers to new short SPDX compliant format	pirms 4 gadiem
DirCacheBuilderIteratorTest.java	Update EDL 1.0 license headers to new short SPDX compliant format	pirms 4 gadiem
DirCacheBuilderTest.java	Update EDL 1.0 license headers to new short SPDX compliant format	pirms 4 gadiem
DirCacheCGitCompatabilityTest.java	DirCache: support index V4	pirms 3 gadiem
DirCacheEntryTest.java	Allow to resolve a conflict by checking out a file	pirms 3 gadiem
DirCacheFindTest.java	Update EDL 1.0 license headers to new short SPDX compliant format	pirms 4 gadiem
DirCacheIteratorTest.java	Update EDL 1.0 license headers to new short SPDX compliant format	pirms 4 gadiem
DirCacheLargePathTest.java	Update EDL 1.0 license headers to new short SPDX compliant format	pirms 4 gadiem
DirCachePathEditTest.java	Allow to resolve a conflict by checking out a file	pirms 3 gadiem
DirCacheTreeTest.java	Update EDL 1.0 license headers to new short SPDX compliant format	pirms 4 gadiem