]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e15037b) | patch
Ignore missing MERGE_MSG when deleting MERGE_MSG 00/3900/1
authorJens Baumgart <jens.baumgart@sap.com>
Tue, 19 Jul 2011 15:31:50 +0000 (17:31 +0200)
committerJens Baumgart <jens.baumgart@sap.com>
Tue, 19 Jul 2011 15:31:50 +0000 (17:31 +0200)
commitdcf9ba411b6661efbfd0acc53eb8ef9e5dc1e1f1
tree74ae06fdc38850d4b99238f2f0b26e0db91c35fdtree | snapshot
parente15037b3c7aa7f72313f19086bce12c54617c1bbcommit | diff
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 <jens.baumgart@sap.com>
org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit