From dcf9ba411b6661efbfd0acc53eb8ef9e5dc1e1f1 Mon Sep 17 00:00:00 2001 From: Jens Baumgart Date: Tue, 19 Jul 2011 17:31:50 +0200 Subject: [PATCH] Ignore missing MERGE_MSG when deleting MERGE_MSG Repository.writeMergeCommitMsg(null) no longer fails if the MERGE_MSG file is missing. This was done to avoid CommitCommand to fail in case of a missing MERGE_MSG file. Bug: 352243 Change-Id: Iddf43533d133f8f22199ed6e2393a552670e7d1f Signed-off-by: Jens Baumgart --- org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java index aab8a8e619..b51a954ca9 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java @@ -1137,7 +1137,7 @@ public abstract class Repository { fos.close(); } } else { - FileUtils.delete(mergeMsgFile); + FileUtils.delete(mergeMsgFile, FileUtils.SKIP_MISSING); } } -- 2.39.5