]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: eb5b506) | patch
Refuse to checkout unmerged paths from index 80/7880/2
authorRobin Stocker <robin@nibor.org>
Sat, 22 Sep 2012 19:27:01 +0000 (21:27 +0200)
committerRobin Stocker <robin@nibor.org>
Sun, 23 Sep 2012 00:41:51 +0000 (02:41 +0200)
commitac805874f72fe2c6193bc959865fb525e069e45e
treee594580e7d5a261f8658806c3699effc2b9ec854tree | snapshot
parenteb5b506acdd22c3e5d97d9b3efaf978659ef07f4commit | diff
Refuse to checkout unmerged paths from index

Without this check, the checkout was done but the result was a "both
deleted" status when inspecting it with C Git.

Found this while working on bug 390147.

Change-Id: Ic3693f2c651827239e838bf7f37da842a7ae9707
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PathCheckoutCommandTest.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/api/CheckoutCommand.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit