aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Baumgart2011-07-19 11:31:50 (EDT)
committerJens Baumgart2011-07-19 11:31:50 (EDT)
commitdcf9ba411b6661efbfd0acc53eb8ef9e5dc1e1f1 (patch)
tree74ae06fdc38850d4b99238f2f0b26e0db91c35fd
parente15037b3c7aa7f72313f19086bce12c54617c1bb (diff)
downloadjgit-dcf9ba411b6661efbfd0acc53eb8ef9e5dc1e1f1.zip
jgit-dcf9ba411b6661efbfd0acc53eb8ef9e5dc1e1f1.tar.gz
jgit-dcf9ba411b6661efbfd0acc53eb8ef9e5dc1e1f1.tar.bz2
Ignore missing MERGE_MSG when deleting MERGE_MSGrefs/changes/00/3900/1
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 <jens.baumgart@sap.com>
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java2
1 files changed, 1 insertions, 1 deletions
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 aab8a8e..b51a954 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);
}
}