I also am getting the issue occasionally. It seems to be breaking references. Running git pull at the command line after getting the error gives this:

error: cannot lock ref 'refs/remotes/origin/EVO-26728': unable to resolve reference 'refs/remotes/origin/EVO-26728': reference broken

It does appear to be when someone else changes the repository. Here is the function I am calling to update the repository. Note that the commented out section was used to check the repository before calling update, but I entered an issue for that. (If there is an empty folder in the repository, worktree.Status() returns that the tree is dirty, if when it isn't.)

`
// Update does a pull on the specified repository
func Update(folder string) ([]*object.Commit, error) {
repo, err := git.PlainOpen(folder)
if err != nil {
return nil, fmt.Errorf("Error opening repository: %s", err)
}

auth := githttp.BasicAuth{Username: "xxxxx", Password: "xxxxx"}

oldHead, err := repo.Head()
if err != nil {
	return nil, fmt.Errorf("Error finding HEAD: %s", err)
}

oldCommit, err := repo.CommitObject(oldHead.Hash())
if err != nil {
	return nil, fmt.Errorf("Error retrieving last commit: %s", err)
}

workTree, err := repo.Worktree()
if err != nil {
	return nil, fmt.Errorf("Error opening work tree: %s", err)
}

// status, err := workTree.Status()
// if err != nil {
// 	if err == git.ErrNonFastForwardUpdate {
// 		return nil, fmt.Errorf("Project needs to be pushed")
// 	}
// 	return nil, fmt.Errorf("Error getting status: %s", err)
// }

// if !status.IsClean() {
// 	return nil, fmt.Errorf("Project has uncommitted changes")
// }

err = workTree.Pull(&git.PullOptions{
	Auth: &auth,
})
if err != nil {
	if err == git.NoErrAlreadyUpToDate {
		return nil, nil
	}
	return nil, fmt.Errorf("Error pulling project: %s", err)
}

logs := []*object.Commit{}

lgs, err := repo.Log(&git.LogOptions{})
if err != nil {
	return nil, fmt.Errorf("Error retrieving logs: %s", err)
}

lgs.ForEach(func(c *object.Commit) error {
	if c.Author.When.After(oldCommit.Author.When) {
		logs = append(logs, c)
	}
	return nil
})

return logs, nil

}
`

Description

Metadata

Metadata

Assignees

Labels

Type

Projects

Milestone

Relationships

Development

Issue actions