Skip to content

Remove ./git/index.lock before fetching

Tomasz Maczukin requested to merge fix/index-lock-on-fetching into master

What does this MR do?

Adds removing of .git/index.lock file before doing a git fetch.

Why was this MR needed?

We're removing the .git/index.lock file just before doing a git checkout command. However this can still be a problem when the project is using the fetch strategy. In such case the git fetch will fail because of existing .git/index.lock file (see #1166 (closed)).

Are there points in the code the reviewer needs to double check?

Does this MR meet the acceptance criteria?

  • CHANGELOG entry added
  • Documentation created/updated
  • Tests
    • Added for this feature/bug
    • All builds are passing
  • Branch has no merge conflicts with master (if you do - rebase it please)

What are the relevant issue numbers?

Fixes #1166 (closed) /cc @nick.thomas @ayufan

Merge request reports