]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a606dc3) | patch
ResolveMerger: Use checkoutEntry during abort 17/37217/1
authorShawn Pearce <sop@google.com>
Wed, 26 Nov 2014 00:14:33 +0000 (16:14 -0800)
committerShawn Pearce <spearce@spearce.org>
Thu, 27 Nov 2014 21:41:58 +0000 (13:41 -0800)
commit3886a4f68b2a85526196c09332843676de9461cd
tree73bbaa969dae6680baaf2f9714e56c03c5d14f20tree | snapshot
parenta606dc363d0f6b09e4527cca6b645d3cb1ec407dcommit | diff
ResolveMerger: Use checkoutEntry during abort

The cleanUp path is trying to restore files that previously were
clean, but were overwritten in the work tree by a partial merge
attempt that has failed and needs to be aborted. Reuse the checkout
logic to write the file content and refresh the stat data.

Change-Id: I320d33b3744daf88d3155db99e957408937ddd00
org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit