mirrors/jgit - jgit - source @ dussan.org

履歴

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>		3年前
..
DirCacheAfterCloneTest.java	DirCache: support index V4	3年前
DirCacheBasicTest.java	Update EDL 1.0 license headers to new short SPDX compliant format	4年前
DirCacheBuilderIteratorTest.java	Update EDL 1.0 license headers to new short SPDX compliant format	4年前
DirCacheBuilderTest.java	Update EDL 1.0 license headers to new short SPDX compliant format	4年前
DirCacheCGitCompatabilityTest.java	DirCache: support index V4	3年前
DirCacheEntryTest.java	Allow to resolve a conflict by checking out a file	3年前
DirCacheFindTest.java	Update EDL 1.0 license headers to new short SPDX compliant format	4年前
DirCacheIteratorTest.java	Update EDL 1.0 license headers to new short SPDX compliant format	4年前
DirCacheLargePathTest.java	Update EDL 1.0 license headers to new short SPDX compliant format	4年前
DirCachePathEditTest.java	Allow to resolve a conflict by checking out a file	3年前
DirCacheTreeTest.java	Update EDL 1.0 license headers to new short SPDX compliant format	4年前