]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e05300b) | patch
Remove ambiguous CheckoutConflictException 78/4178/8
authorTomasz Zarna <Tomasz.Zarna@pl.ibm.com>
Tue, 6 Mar 2012 21:43:25 +0000 (22:43 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Tue, 6 Mar 2012 21:43:25 +0000 (22:43 +0100)
commit90d002c15fd2131b9f80fb9bb6f28bf691c00b5d
treed5b008b2ab003a7b49543a4181a55d9ab78c02cetree | snapshot
parente05300b21d5a0479eb278ee38c6d19c956e926f4commit | diff
Remove ambiguous CheckoutConflictException

Checkout command should throw o.e.j.api.errors.CheckoutConflictException
which is a GitAPIException not o.e.j.errors.CheckoutConflictException.
PullCommand should rethrow the API exception as a JGitInternalException.

Bug: 356922
Change-Id: I865c4905997d9834c85a97fbe7287604daf99075
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
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/api/CheckoutCommand.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/api/errors/CheckoutConflictException.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit