diff options
| author | Robin Stocker <robin@nibor.org> | 2012-10-20 22:00:13 +0200 |
|---|---|---|
| committer | Robin Stocker <robin@nibor.org> | 2012-11-12 22:51:18 +0100 |
| commit | 0f88d7b72ff09297954930cbe2a23cf8feff9382 (patch) | |
| tree | ef4358f7897c96fff2215f4b8c3e58dfac92920a /.gitignore | |
| parent | 106e8b87625cd1ad6b2cec14d676c23174422352 (diff) | |
| download | jgit-0f88d7b72ff09297954930cbe2a23cf8feff9382.tar.gz jgit-0f88d7b72ff09297954930cbe2a23cf8feff9382.zip | |
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
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions