OTWO-5721: Cleanup git lock file before checkout

Author: kselvraj

lib/ohloh_scm/git/scm.rb

@@ -2,7 +2,7 @@
 
 module OhlohScm
   module Git
-    class Scm < OhlohScm::Scm
+    class Scm < OhlohScm::Scm # rubocop:disable Metrics/ClassLength
       def initialize(core:, url:, branch_name:, username:, password:)
         super
         @branch_name = branch_name || 'master'
@@ -54,14 +54,18 @@ def clone_and_create_tracking_branch(remote_scm)
       # We need very high reliability and this sequence gets the job done every time.
       def clean_and_checkout_branch
         return unless status.scm_dir_exist?
-
-        run "cd '#{url}' && git clean -f -d -x"
         return unless status.branch?(branch_name)
 
+        run "cd '#{url}' && git clean -f -d -x"
+        clean_git_lock_file
         run "cd '#{url}' && git reset --hard HEAD"
         run "cd '#{url}' && git checkout #{branch_name} --"
       end
 
+      def clean_git_lock_file
+        run "rm #{url}/.git/index.lock" if File.exist?("#{url}/.git/index.lock")
+      end
+
       def create_tracking_branch(branch_name)
         return if branch_name.to_s.empty?
         return if activity.branches.include?(branch_name)

lib/ohloh_scm/version.rb

@@ -2,7 +2,7 @@
 
 module OhlohScm
   module Version
-    STRING = '3.0.5'
+    STRING = '3.0.6'
     GIT = '2.17.1'
     SVN = '1.9.7'
     CVSNT = '2.5.04'