]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 106e8b8) | patch
CommitCommand: Ensure unmerged paths are added correctly with setOnly 23/8323/2
authorRobin Stocker <robin@nibor.org>
Sat, 20 Oct 2012 20:00:13 +0000 (22:00 +0200)
committerRobin Stocker <robin@nibor.org>
Mon, 12 Nov 2012 21:51:18 +0000 (22:51 +0100)
commit0f88d7b72ff09297954930cbe2a23cf8feff9382
treeef4358f7897c96fff2215f4b8c3e58dfac92920atree | snapshot
parent106e8b87625cd1ad6b2cec14d676c23174422352commit | diff
CommitCommand: Ensure unmerged paths are added correctly with setOnly

With bug 391855, PathEdit will be changed to apply an edit for each
stage. With that, CommitCommand would no longer work correctly when
committing an unmerged path.

This changes it to use a DirCacheBuilder which allows us to correctly
replace the entries for the three stages with one, which is not possible
with PathEdit.

Bug: 391859
Change-Id: I6dc180aec7e2cbf8d1e91f50482c95bc420f79de
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit