From 2778bb2cc9bf7bdfb2ed7b3a99dd931d6d3fbbfa Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 25 Aug 2022 19:37:35 +0200 Subject: WorkTreeUpdater: remove safeWrite option This was added in Ideaefd5178 to anticipate on writing files for ApplyCommand, but we are keeping WorkTreeUpdater private to the merge package for now. Change-Id: Ifa79dac245e60eb7a77eaea4cc1249222e347d38 --- org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/merge') diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java index d79f5d4100..f4d19cb79a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java @@ -915,7 +915,7 @@ public class ResolveMerger extends ThreeWayMerger { StreamLoader contentLoader = WorkTreeUpdater.createStreamLoader(rawMerged::openInputStream, rawMerged.length()); workTreeUpdater.updateFileWithContent(contentLoader, - eol, tw.getSmudgeCommand(attributes), of.getPath(), of, false); + eol, tw.getSmudgeCommand(attributes), of.getPath(), of); return of; } -- cgit v1.2.3