• Icon: New Feature New Feature
    • Resolution: Unresolved
    • Icon: Trivial Trivial
    • git-plugin
    • None
    • windows

      When using Merge Before Build, sometimes throws error:
      git merge --ff df24f37fedf6048881cc0683a782c975b0bd8db7 # timeout=10
      ERROR: Timeout after 10 minutes
      > git config core.sparsecheckout # timeout=10
      > git checkout -f df24f37fedf6048881cc0683a782c975b0bd8db7 # timeout=20
      FATAL: Could not lock repository. Please try again

      and next build in the same workspace is failed with error:
      FATAL: Could not lock repository. Please try again

      This happens because my repositore is very big. I want set a merge timeout or kill git process before next try.
      Thanks

          [JENKINS-32143] Set git merge timeout

          Dmitry Ryazancev created issue -
          Mark Waite made changes -
          Assignee Original: Mark Waite [ markewaite ]
          Dmitry Ryazancev made changes -
          Component/s New: git-client-plugin [ 17423 ]
          R. Tyler Croy made changes -
          Workflow Original: JNJira [ 167629 ] New: JNJira + In-Review [ 182815 ]
          Mark Waite made changes -
          Component/s Original: git-client-plugin [ 17423 ]
          Mark Waite made changes -
          Labels New: newbie-friendly
          Sladyn Nunes made changes -
          Assignee New: Sladyn Nunes [ sladyn98 ]

          Sladyn Nunes added a comment -

          With respect to this issue from a bit of research I suppose the changes are to be made to `PreBuildMerge.java` and my question is would we set the timeout just before the merge happens so that the process does not give an error or do we want to check if the merge has failed due to timeout by storing it in the `BuildData` and killing the process so that a new merge is attempted with a changed timeout.

          Sladyn Nunes added a comment - With respect to this issue from a bit of research I suppose the changes are to be made to `PreBuildMerge.java` and my question is would we set the timeout just before the merge happens so that the process does not give an error or do we want to check if the merge has failed due to timeout by storing it in the `BuildData` and killing the process so that a new merge is attempted with a changed timeout.

          Mark Waite added a comment -

          I think we should keep it consistent with other timeout implementations. They configure a timeout on the command line git process and abort the command if it has not completed before the timeout expires.

          Mark Waite added a comment - I think we should keep it consistent with other timeout implementations. They configure a timeout on the command line git process and abort the command if it has not completed before the timeout expires.
          Mark Waite made changes -
          Status Original: Open [ 1 ] New: In Progress [ 3 ]

            Unassigned Unassigned
            da_ryazancev Dmitry Ryazancev
            Votes:
            1 Vote for this issue
            Watchers:
            5 Start watching this issue

              Created:
              Updated: