]> source.dussan.org Git - jgit.git/commit
Don't raise checkout conflict for file missing in working tree 29/22529/2
authorChristian Halstrick <christian.halstrick@sap.com>
Tue, 25 Feb 2014 16:29:45 +0000 (17:29 +0100)
committerChristian Halstrick <christian.halstrick@sap.com>
Wed, 26 Feb 2014 14:35:05 +0000 (15:35 +0100)
commit73c8e70797c5517972d06f03f2aadfb9aacfb223
treef52d65a378f635a4b5f22b09d702a95286dc7308
parentea16c2afff85b7659391f1c418b2272c5a02bd5e
Don't raise checkout conflict for file missing in working tree

During a checkout we want to prevent to overwrite unsaved local file
content. Jgit was therefore checking whether the file to overwrite is
dirty or missing and would raise a conflict if this was the case. That
was wrong. It should only check if the file is dirty. It's ok to
"overwrite" a missing/non-existing file.

Change-Id: I63c3a94f663c87f09170fdf8b1b1bf4ed5246fc5
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF
org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/CheckoutTest.java
org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java