diff options
author | Christian Halstrick <christian.halstrick@sap.com> | 2014-02-25 17:29:45 +0100 |
---|---|---|
committer | Christian Halstrick <christian.halstrick@sap.com> | 2014-02-26 15:35:05 +0100 |
commit | 73c8e70797c5517972d06f03f2aadfb9aacfb223 (patch) | |
tree | f52d65a378f635a4b5f22b09d702a95286dc7308 /pom.xml | |
parent | ea16c2afff85b7659391f1c418b2272c5a02bd5e (diff) | |
download | jgit-73c8e70797c5517972d06f03f2aadfb9aacfb223.tar.gz jgit-73c8e70797c5517972d06f03f2aadfb9aacfb223.zip |
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>
Diffstat (limited to 'pom.xml')
0 files changed, 0 insertions, 0 deletions