[JIRA] (JENKINS-17198) Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files
Mark Waite commented on JENKINS-17198 Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files @Dallas, I believe git-client-plugin 1.0.5 acknowledges that the JGit implementation is not yet mature enough for general purpose use as a replacement for the git command line implementation. When the JGit implementation has the necessary features, the plugin maintainer will consider changing the default to use JGit instead of using the command line. For at least some bug reports, there is a robot that resolves the issue when a submission is made that declares the issue is resolved. I interpreted that to mean that anyone can resolve an issue, including the submitter of the change which fixes the issue. The project does not seem to require or mandate that the issue can only be resolved by the person who reported the issue. In this case, I think it would be great if the original submitter would install git-client-plugin 1.0.5 and confirm the issue is resolved, but in the general case, if the issue is resolved, anyone can mark it as resolved. The plugin maintainer can still refer to this bug report (and others) before the next time when it is chosen to make JGit the default implementation instead of using the CLI implementation. 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 jenkinsci-issues+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[JIRA] (JENKINS-17198) Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files
Ben Chatelain commented on JENKINS-17198 Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files I had this same issue with Git Plugin 1.3.0 and Git Client Plugin 1.0.4. Something about the way CocoaPods sets up the directory structure was confusing the JGit checkout for all of our projects using that to install iOS dependencies (other projects were unaffected). The new Git Client Plugin 1.0.5 released today fixes the issue. Thank you! 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 jenkinsci-issues+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[JIRA] (JENKINS-17198) Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files
Ben Chatelain closed JENKINS-17198 as Fixed Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files Fixed in 1.0.5 Change By: Ben Chatelain (21/Mar/13 7:42 PM) Status: Open Closed Resolution: Fixed 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 jenkinsci-issues+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[JIRA] (JENKINS-17198) Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files
Dallas Gutauckis reopened JENKINS-17198 Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files 1.0.5 simply defaults to the workaround; doesn't resolve this issue at all. Additionally, the person fixing the issue and/or reporting the issue should probably be the one(s) to confirm the issue resolved. Change By: Dallas Gutauckis (21/Mar/13 7:51 PM) Resolution: Fixed Status: Closed Reopened 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 jenkinsci-issues+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[JIRA] (JENKINS-17198) Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files
Jeff Fairchild commented on JENKINS-17198 Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files When will it be available for download? 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 jenkinsci-issues+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[JIRA] (JENKINS-17198) Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files
Ben Chatelain commented on JENKINS-17198 Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files The Git Client Plugin 1.0.5 was released earlier today. If you're checking for updates under "Manage Plugins", make sure to go to the Advanced tab and click the "Check Now" button to refresh the plugin metadata. 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 jenkinsci-issues+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[JIRA] (JENKINS-17198) Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files
Michael Prokop commented on JENKINS-17198 Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files Same here, works with Git Plugin 1.2.0 and Git Client Plugin at 1.0.3, fails with newer versions (in my case: a symlink present in the Git repos): 17:31:05 hudson.plugins.git.GitException: Could not checkout 8b3456787edbe0043627368bb1aa2c1f36625440 17:31:05 at org.jenkinsci.plugins.gitclient.JGitAPIImpl.checkout(JGitAPIImpl.java:68) ... 17:31:05 Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files: 17:31:05 debian/lua5.2.dh-lua.conf 17:31:05 at org.eclipse.jgit.api.CheckoutCommand.call(CheckoutCommand.java:244) 17:31:05 at org.jenkinsci.plugins.gitclient.JGitAPIImpl.checkout(JGitAPIImpl.java:64) 17:31:05 ... 16 more 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 jenkinsci-issues+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[JIRA] (JENKINS-17198) Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files
Scott Carter commented on JENKINS-17198 Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files Downgrading the git plugin to 1.2 and git-client plugin to 1.0.3 has got me back to a working state for now. 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 jenkinsci-issues+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[JIRA] (JENKINS-17198) Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files
Joe Hansche commented on JENKINS-17198 Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files Same here, we had to downgrade to 1.20 and 1.0.3, and also had to enable the useCLI flag. 1.30 and 1.0.4 broke most of our jobs, and downgrading to 1.1.27 is impossible because the 1.20 upgrade causes a backward-incompatible change in all build.xml and config files. 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 jenkinsci-issues+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[JIRA] (JENKINS-17198) Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files
Takayuki Okazaki commented on JENKINS-17198 Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files In our environment, this workaround doesn't solve this issue. -Dorg.jenkinsci.plugins.gitclient.Git.useCLI=true However, we solved with combination below, which described at http://mrkn.hatenablog.com/entry/2013/03/18/225556 (Japanese). Git Plugin : 1.3.0 Git Client Plugin : 1.0.3 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 jenkinsci-issues+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[JIRA] (JENKINS-17198) Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files
Dallas Gutauckis commented on JENKINS-17198 Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files If you're using a master/slave configuration you need to set the argument in your slave configuration as well. 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 jenkinsci-issues+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[JIRA] (JENKINS-17198) Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files
Takayuki Okazaki commented on JENKINS-17198 Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files Ah, That's make sense. Thanks 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 jenkinsci-issues+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[JIRA] (JENKINS-17198) Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files
Nicolas De Loof commented on JENKINS-17198 Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files https://jenkins.ci.cloudbees.com/job/plugins/job/git-client-plugin/34/org.jenkins-ci.plugins$git-client/ provably is a better candidate to get this issue fixed : it used a patched version of JGit to include https://bugs.eclipse.org/bugs/show_bug.cgi?id=354367 proposed fix 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 jenkinsci-issues+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[JIRA] (JENKINS-17198) Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files
Matt Chotin commented on JENKINS-17198 Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files I installed https://jenkins.ci.cloudbees.com/job/plugins/job/git-client-plugin/34/org.jenkins-ci.plugins$git-client/ and restarted Jenkins and still have this issue. hudson.plugins.git.GitException: Could not checkout 00f6e95c8ff6cc6f7ca544fa07124dd3edaa0586 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:1261) at hudson.plugins.git.GitSCM.access$1200(GitSCM.java:57) at hudson.plugins.git.GitSCM$4.invoke(GitSCM.java:1220) at hudson.plugins.git.GitSCM$4.invoke(GitSCM.java:1196) at hudson.FilePath.act(FilePath.java:865) at hudson.FilePath.act(FilePath.java:838) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1196) at hudson.model.AbstractProject.checkout(AbstractProject.java:1353) at hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:689) at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:88) at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:594) at hudson.model.Run.execute(Run.java:1567) at hudson.model.FreeStyleBuild.run(FreeStyleBuild.java:46) at hudson.model.ResourceController.execute(ResourceController.java:88) at hudson.model.Executor.run(Executor.java:237) Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with file: Cannot delete file: ios/PorkButt/opentok-ios-sdk/Opentok.framework/Headers/OTError.h at org.eclipse.jgit.api.CheckoutCommand.call(CheckoutCommand.java:246) at org.jenkinsci.plugins.gitclient.JGitAPIImpl.checkout(JGitAPIImpl.java:64) ... 16 more Caused by: org.eclipse.jgit.errors.CheckoutConflictException: Checkout conflict with file: Cannot delete file: ios/PorkButt/opentok-ios-sdk/Opentok.framework/Headers/OTError.h at org.eclipse.jgit.dircache.DirCacheCheckout.cleanUpConflicts(DirCacheCheckout.java:1011) at org.eclipse.jgit.dircache.DirCacheCheckout.doCheckout(DirCacheCheckout.java:413) at org.eclipse.jgit.dircache.DirCacheCheckout.checkout(DirCacheCheckout.java:391) at org.eclipse.jgit.api.CheckoutCommand.call(CheckoutCommand.java:242) ... 17 more There are symlinks in there. 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 jenkinsci-issues+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[JIRA] (JENKINS-17198) Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files
Nicolas De Loof commented on JENKINS-17198 Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files Can you please try SNASPHOT build https://jenkins.ci.cloudbees.com/job/plugins/job/git-client-plugin/33/org.jenkins-ci.plugins$git-client/artifact/org.jenkins-ci.plugins/git-client/1.0.5-SNAPSHOT/git-client-1.0.5-SNAPSHOT.hpi ? This one includes a possible fix to ask JGit to handle the detected conflict by itself 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 jenkinsci-issues+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[JIRA] (JENKINS-17198) Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files
Nicolas De Loof commented on JENKINS-17198 Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files relates to https://bugs.eclipse.org/bugs/show_bug.cgi?id=354367 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 jenkinsci-issues+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[JIRA] (JENKINS-17198) Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files
Nicolas De Loof commented on JENKINS-17198 Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files short term workaround is either to run jenkins with -Dorg.jenkinsci.plugins.gitclient.Git.useCLI=true, or check "clean workspace after checkout" - this option will clean workspace ...before (sic!) checkout and avoid conflict. Could you also tell me if there is anything during your build that could have touched support/tools/relink/macholib/MachO.py ? I'm looking for a public git repository I could use to reproduce this issue. 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 jenkinsci-issues+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[JIRA] (JENKINS-17198) Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files
Dallas Gutauckis commented on JENKINS-17198 Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files We also experienced this issue after upgrading. We determined that our issue was due to JGit (and therefore git-plugin) not supporting symbolic links and our git repository has multiple symbolic links. We also used the workaround -Dorg.jenkinsci.plugins.gitclient.Git.useCLI=true to resolve the issue, but we're wondering what the actual implementation will be to resolve this issue. 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 jenkinsci-issues+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[JIRA] (JENKINS-17198) Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files
Craig Newell created JENKINS-17198 Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files Issue Type: 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 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 jenkinsci-issues+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
