]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 835955f) | patch
Use local GIT_DIR for overflow during merge conflicts 65/45065/1
authorShawn Pearce <spearce@spearce.org>
Wed, 1 Apr 2015 19:53:00 +0000 (12:53 -0700)
committerShawn Pearce <spearce@spearce.org>
Wed, 1 Apr 2015 20:02:08 +0000 (13:02 -0700)
commit6884ea24cd0fcce78e9653e4d1a658eefa2cd68a
treec5a1184e042ddf82e724a08c208175c617b6c60etree | snapshot
parent835955fc5b3dcb27d7da0cdfcf24b436f9828d4acommit | diff
Use local GIT_DIR for overflow during merge conflicts

By writing the temporary overflow merge result to $GIT_DIR JGit
can ensure the same filesystem permissions apply to protect the
file contents.

If no directory is available from the repository (e.g. DfsRepository)
null will be passed and the system temporary directory will be used
instead.

Change-Id: I95532aa092676d18f1dc1e3fdbe6dcb1f91b782e
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