]> source.dussan.org Git - jgit.git/commit
Make sure checkout doesn't report conflicts on ignored paths 63/36063/3
authorChristian Halstrick <christian.halstrick@sap.com>
Thu, 6 Nov 2014 18:01:23 +0000 (19:01 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Thu, 6 Nov 2014 20:27:46 +0000 (15:27 -0500)
commit8456927b1bbb344cc6a768b1f491dddd50d4ce7c
treebf02328525243eb8dbb3490180f188a8d8684897
parentabb57e6b5674b7251bd94b7238e5d995ad9c30c5
Make sure checkout doesn't report conflicts on ignored paths

In a situation where a certain path was ignored but a working tree file
with this path existed jgit didn't allow to checkout a branch which
didn't ignore this path but contained different content. JGit considered
this to be a checkout conflict to prevent overwriting the file in the
working tree and raised an error. This commit fixes this by ensuring
that ignored dirty working tree files don't lead to a checkout conflict.

Bug: 450169
Change-Id: I90288d314ffac73c24a9c70a5181f8243bd4679a
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/DirCacheCheckoutTest.java
org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java