[JIRA] (JENKINS-17198) Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files

Wed, 13 Mar 2013 11:10:59 -0700

Issue Type: Bug Bug
Affects Versions: current
Assignee: Nicolas De Loof
Components: git
Created: 13/Mar/13 6:10 PM
Description:

The jGIT client has lots of repository compatibility issues as compared to the normal command line git client. Updating to git-client 1.0.4 results in:

Building remotely on mac mini 1 in workspace /Users/jenkins/workspace/Fuji
Checkout:Fuji / /Users/jenkins/workspace/Fuji - hudson.remoting.Channel@c27576:mac mini 1
Using strategy: Default
Last Built Revision: Revision 88877737299f64f83e8230928e8b2db4ebe1826b (origin/master)
Fetching changes from 1 remote Git repository
Commencing build of Revision 124296a2ae55606a975ed1888c4e030dd9e0f3e4 (origin/master)
Checking out Revision 124296a2ae55606a975ed1888c4e030dd9e0f3e4 (origin/master)
FATAL: Could not checkout 124296a2ae55606a975ed1888c4e030dd9e0f3e4
hudson.plugins.git.GitException: Could not checkout 124296a2ae55606a975ed1888c4e030dd9e0f3e4
	at org.jenkinsci.plugins.gitclient.JGitAPIImpl.checkout(JGitAPIImpl.java:68)
	at hudson.plugins.git.GitAPI.checkout(GitAPI.java:208)
	at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1273)
	at hudson.plugins.git.GitSCM.access$1100(GitSCM.java:57)
	at hudson.plugins.git.GitSCM$4.invoke(GitSCM.java:1232)
	at hudson.plugins.git.GitSCM$4.invoke(GitSCM.java:1208)
	at hudson.FilePath$FileCallableWrapper.call(FilePath.java:2348)
	at hudson.remoting.UserRequest.perform(UserRequest.java:118)
	at hudson.remoting.UserRequest.perform(UserRequest.java:48)
	at hudson.remoting.Request$2.run(Request.java:326)
	at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72)
	at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303)
	at java.util.concurrent.FutureTask.run(FutureTask.java:138)
	at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
	at java.lang.Thread.run(Thread.java:680)
Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files: 
support/tools/relink/macholib/MachO.py

whereas the normal command line git client is happy with the repository.




Can we get a work around of a configuration setting to say use either the command line git client or jGIT?
Environment: git-client > 1.0.2
Project: Jenkins
Priority: Blocker Blocker
Reporter: Craig Newell
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira

--
You received this message because you are subscribed to the Google Groups "Jenkins Issues" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
 
 

Reply via email to