delete index.lock file upon repository init

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

Author: reggie-k

reposerver/repository/repository.go

@@ -165,6 +165,30 @@ func (s *Service) Init() error {
 		fullPath := filepath.Join(s.rootDir, file.Name())
 		closer := s.gitRepoInitializer(fullPath)
 		if repo, err := gogit.PlainOpen(fullPath); err == nil {
+			indexFile := filepath.Join(fullPath, ".git", "index")
+			indexLockFile := filepath.Join(fullPath, ".git", "index.lock")
+			if _, err = os.Stat(indexLockFile); err == nil {
+				log.Warnf("Lock file present in git repository %s, removing it", fullPath)
+				if err = os.Remove(indexLockFile); err != nil {
+					log.Errorf("Failed to remove lock file %s: %v", indexLockFile, err)
+				}
+				if err = os.Remove(indexFile); err != nil {
+					log.Errorf("Failed to remove index file %s: %v", indexFile, err)
+				}
+
+				if err == nil {
+					wt, _ := repo.Worktree()
+					headRef, _ := repo.Head()
+					err = wt.Reset(&gogit.ResetOptions{
+						Mode:   gogit.MixedReset,
+						Commit: headRef.Hash(),
+					})
+				}
+
+				if err != nil {
+					log.Errorf("Failed to reset git repo %s: %v", fullPath, err)
+				}
+			}
 			if remotes, err := repo.Remotes(); err == nil && len(remotes) > 0 && len(remotes[0].Config().URLs) > 0 {
 				s.gitRepoPaths.Add(git.NormalizeGitURL(remotes[0].Config().URLs[0]), fullPath)
 			}

reposerver/repository/repository_test.go

@@ -3014,6 +3014,21 @@ func TestInit(t *testing.T) {
 	_, err := os.ReadDir(dir)
 	require.Error(t, err)
 	initGitRepo(t, newGitRepoOptions{path: path.Join(dir, "repo2"), remote: "https://github.com/argo-cd/test-repo2", createPath: true, addEmptyCommit: false})
+
+	repoPath = path.Join(dir, "repo3")
+	lockFile := path.Join(repoPath, ".git", "index.lock")
+	initGitRepo(t, newGitRepoOptions{path: repoPath, remote: "https://github.com/argo-cd/test-repo3", createPath: true, addEmptyCommit: false})
+	require.NoError(t, os.WriteFile(lockFile, []byte("test"), 0o644))
+
+	service = newService(t, ".")
+	service.rootDir = dir
+
+	_, err = os.Stat(lockFile)
+	require.NoError(t, err)
+	require.NoError(t, service.Init())
+	_, err = os.Stat(lockFile)
+	require.Error(t, err, "lock file should be removed after Init()")
+	require.ErrorContains(t, err, ".git/index.lock: no such file or directory")
 }
 
 // TestCheckoutRevisionCanGetNonstandardRefs shows that we can fetch a revision that points to a non-standard ref. In