Uploaded image for project: 'Jenkins'
  1. Jenkins
  2. JENKINS-17359

Git plugin: add 'clean before checkout' option

XMLWordPrintable

    • Icon: Bug Bug
    • Resolution: Fixed
    • Icon: Major Major
    • git-plugin
    • None

      I have cgit builds, 1 that uses the git submodule and 1 that uses a fast snapshot download of git to build cgit.

      Because the snapshot download is untarred into the same (submodule) directory, a checkout of a new fails.

      This seems to have changed somewhere right at or after the 1.500 release because before it worked fine.

      log:

      Started by an SCM change
      Building in workspace /var/lib/jenkins/workspace/cgit_upstream_get-git_master
      Checkout:cgit_upstream_get-git_master / /var/lib/jenkins/workspace/cgit_upstream_get-git_master - hudson.remoting.LocalChannel@77ed71cb
      Using strategy: Default
      Last Built Revision: Revision e1e0e038fd0fee3fe10524d7466deab03e78deb5 (origin/master)
      Fetching changes from 1 remote Git repository
      Pruning obsolete local branches
      Commencing build of Revision b60e6bff75719a5fb0df970bac3be6b2726cf73a (origin/master)
      Checking out Revision b60e6bff75719a5fb0df970bac3be6b2726cf73a (origin/master)
      Cleaning workspace
      FATAL: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with file: Cannot delete file: git/.depend
      hudson.plugins.git.GitException: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with file: Cannot delete file: git/.depend
      at org.jenkinsci.plugins.gitclient.JGitAPIImpl.clean(JGitAPIImpl.java:310)
      at hudson.plugins.git.GitAPI.clean(GitAPI.java:248)
      at hudson.plugins.git.GitSCM$4.invoke(GitSCM.java:1213)
      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:1364)
      at hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:670)
      at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:88)
      at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:575)
      at hudson.model.Run.execute(Run.java:1575)
      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: git/.depend
      at org.eclipse.jgit.api.ResetCommand.checkoutIndex(ResetCommand.java:361)
      at org.eclipse.jgit.api.ResetCommand.call(ResetCommand.java:204)
      at org.jenkinsci.plugins.gitclient.JGitAPIImpl.clean(JGitAPIImpl.java:304)
      ... 14 more
      Caused by: org.eclipse.jgit.errors.CheckoutConflictException: Checkout conflict with file: Cannot delete file: git/.depend
      at org.eclipse.jgit.dircache.DirCacheCheckout.cleanUpConflicts(DirCacheCheckout.java:873)
      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.ResetCommand.checkoutIndex(ResetCommand.java:359)
      ... 16 more

            ndeloof Nicolas De Loof
            fhuberts Ferry Huberts
            Votes:
            1 Vote for this issue
            Watchers:
            6 Start watching this issue

              Created:
              Updated:
              Resolved: