]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9105e1c) | patch
A folder does not constitute a dirty work tree 61/10461/2
authorRobin Rosenberg <robin.rosenberg@dewire.com>
Mon, 18 Feb 2013 22:59:20 +0000 (23:59 +0100)
committerRobin Rosenberg <robin.rosenberg@dewire.com>
Sun, 10 Mar 2013 15:53:23 +0000 (16:53 +0100)
commit3cd089f04cf1122e6a9d0a6f842ddd0b46a7a9bd
tree3cea25d94f70e733d4799aca9ffe7b9a9e896963tree | snapshot
parent9105e1c9afe161a84cf612d532454f57207383facommit | diff
A folder does not constitute a dirty work tree

This fixes two cases:
- A folder without tracked content exist both in the workdir and merged
commit, as long as there names within that folder does not conflict.
- An empty folder structure exists with the same name as a file in the
merged commit.

Bug: 402834
Change-Id: I4c5b9f11313dd1665fcbdae2d0755fdb64deb3ef
org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java diff | blob | history
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