handle lock file deletion before checkoputRevision

Signed-off-by: reggie-k <regina.voloshin@codefresh.io>

Author: reggie-k

reposerver/repository/repository.go

@@ -2536,21 +2536,19 @@ func fetch(gitClient git.Client, targetRevisions []string) error {
 // removeStaleGitLocks best-effort removes common stale git lock files in the repository.
 // It is safe to call while holding the per-repo lock and before running any git commands.
 
-func removeStaleGitLocks(repoRoot string) {
+func removeStaleGitLock(repoRoot string) {
 	path := filepath.Join(repoRoot, ".git", "HEAD.lock")
 	log.Infof("Checking whether HEAD.lock exists %s", path)
 	if _, err := os.Stat(path); err == nil {
 		log.Warnf("HEAD.lock present in git repository %s, removing it", repoRoot)
-		if rmErr := os.Remove(path); rmErr == nil {
-			log.Infof("Removed stale git lock %s", path)
-		} else if !os.IsNotExist(rmErr) {
-			log.Warnf("Failed to remove git lock %s: %v", path, rmErr)
+		if rmErr := os.Remove(path); rmErr != nil {
+			log.Errorf("Failed to remove git lock %s: %v", path, rmErr)
 		}
 	}
 }
 
 func checkoutRevision(gitClient git.Client, revision string, submoduleEnabled bool) error {
-	removeStaleGitLocks(gitClient.Root())
+	removeStaleGitLock(gitClient.Root())
 
 	err := gitClient.Init()
 	if err != nil {

reposerver/repository/repository_test.go

@@ -3028,15 +3028,15 @@ func TestRemoveStaleGitHeadLock(t *testing.T) {
 	_, err := os.Stat(headLock)
 	require.NoError(t, err)
 
-	removeStaleGitLocks(dir)
+	removeStaleGitLock(dir)
 
 	// lock should be gone after cleanup
 	_, err = os.Stat(headLock)
 	require.Error(t, err)
 	require.True(t, os.IsNotExist(err))
 
 	// calling again should be a no-op (no error)
-	removeStaleGitLocks(dir)
+	removeStaleGitLock(dir)
 }
 
 // TestCheckoutRevisionCanGetNonstandardRefs shows that we can fetch a revision that points to a non-standard ref. In