]> source.dussan.org Git - jgit.git/commit
Reapply "Create util class for work tree updating in both filesystem and index." 99/195099/5
authorNitzan Gur-Furman <nitzan@google.com>
Mon, 8 Aug 2022 15:50:47 +0000 (17:50 +0200)
committerHan-Wen Nienhuys <hanwen@google.com>
Mon, 8 Aug 2022 16:38:23 +0000 (18:38 +0200)
commit23a71696cd9785e99dad93e54c3884edfdac1157
tree826e35fc5f44df9780fae0a84bcf7a3465ef344e
parent3b4a636183609e2c4090cc6bdbbd8fecb2789a4e
Reapply "Create util class for work tree updating in both filesystem and index."

This reverts commit 5709317f71ccaf26eceaa896150f203879b634b8.

Add a bugfix for deletions in ResolveMergers instantiated with just an
ObjectInserter as argument.

Original change description:

Create util class for work tree updating in both filesystem and index.

This class intends to make future support in index updating easier.

This class currently extracts some logic from ResolveMerger. Logic
related to StreamSupplier was copied from ApplyCommand, which will be
integrated in a following change.

Co-authored-by: Nitzan Gur-Furman <nitzan@google.com>
Co-authored-by: Han-Wen Nienhuys <hanwen@google.com>
Change-Id: Ideaefd51789a382a8b499d1ca7ae0146d032f48b
org.eclipse.jgit/src/org/eclipse/jgit/api/ApplyCommand.java
org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java
org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
org.eclipse.jgit/src/org/eclipse/jgit/util/WorkTreeUpdater.java [new file with mode: 0644]