]> source.dussan.org Git - jgit.git/commit
Ensure a directory exists before trying to create/merge a file into it. 96/7096/5
authorJevgeni Zelenkov <jevgeni.zelenkov@gmail.com>
Mon, 6 Aug 2012 06:59:28 +0000 (08:59 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Mon, 6 Aug 2012 06:59:28 +0000 (08:59 +0200)
commit803debd7be76a2f18624254409228433c9c329f2
treed44f7c61e69fd73d7301c6c56cd751d448b6bfb8
parentd08b35532a2403b0f1b2dbb68436cfa68d2b924a
Ensure a directory exists before trying to create/merge a file into it.

Since git doesn't keep track of empty directories, they should be
created first. Test case included demonstrates that using
StashApplyCommand(). Bugfix is applied to the DirCacheCheckout class,
because StashApplyCommand() uses it internally to apply a stash.

Change-Id: Iac259229ef919f9e92e7e51a671d877172bb88a8
Signed-off-by: Jevgeni Zelenkov <jevgeni.zelenkov@gmail.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/JGitTestUtil.java
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashApplyCommandTest.java
org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RepositoryTestCase.java
org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java