abhinav / abhinav/git-spice

'gs repo sync' left repo in broken state with concurrent write

Open
#659 0 comments 0 reactions 0 assignees View on GitHub
bug
Dominant language
Go
Stars
762
Forks
72
Avg merge
18h 24m
Merged PRs (30d)
28

Description

A user reported the following:

```
$ gs repo sync
INF master: pulled 19 new commit(s)
INF feat1: #330613 was merged
FTL gs: delete merged branches: rebase: exit status 1
stderr:
error: update_ref failed for ref 'HEAD': cannot lock ref 'HEAD': Unable to create '[..]/.git/HEAD.lock': File exists.

Another git process [..]
error: could not detach HEAD
```

It looks like the rebase operation performed as part of deleting merged branches ran afoul of another process messing with the Git branch.

After the error, the user was left with a working tree at the state of the master branch, but HEAD pointing to the branch we failed to delete.

I don't think we can guard against HEAD.lock/index.lock conflicts, but perhaps there should be more recovery here.

Contributor guide

Open the contributing guide

Assessment

This issue has not been assessed yet.

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.