]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 086f474) | patch
Fix NPE in DirCacheCheckout 43/174143/3
authorThomas Wolf <thomas.wolf@paranor.ch>
Wed, 30 Dec 2020 09:12:34 +0000 (10:12 +0100)
committerThomas Wolf <thomas.wolf@paranor.ch>
Wed, 30 Dec 2020 09:51:14 +0000 (10:51 +0100)
commit5b1a6e0e382da62e8678afdb2524109efb38eeb4
tree838914dd3a6355044bc6b02382bbe8534755d9actree | snapshot
parent086f474054440579dece78aa3a12a3157c80b344commit | diff
Fix NPE in DirCacheCheckout

If a file exists in head, merge, and the working tree, but not in
the index, and we're doing a force checkout, the checkout must be
an "update", not a "keep".

This is a follow-up on If3a9b9e60064459d187c7db04eb4471a72c6cece.

Bug: 569962
Change-Id: I59a7ac41898ddc1dd90e86b09b621a41fdf45667
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CheckoutCommandTest.java diff | blob | history
org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/DirCacheCheckoutTest.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit