diff options
| author | Toon Claes <toon@gitlab.com> | 2021-09-08 15:07:32 +0300 |
|---|---|---|
| committer | Toon Claes <toon@gitlab.com> | 2021-09-08 15:07:32 +0300 |
| commit | ab6438664b9303ea430ff511c5af66ab41cb127a (patch) | |
| tree | 4ace5de26a78630903ccf763bb691c9547ac6ac7 /cmd | |
| parent | 0aa45e06052844589c8c6ca438d7ccbf38c6929d (diff) | |
| parent | 1657adcdd9b6c4b753ec4b1989558180809c019e (diff) | |
Merge branch 'pks-updateref-lock-during-tx' into 'master'
updateref: Partially fix locking semantics
See merge request gitlab-org/gitaly!3829
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/gitaly-ssh/upload_pack_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/gitaly-ssh/upload_pack_test.go b/cmd/gitaly-ssh/upload_pack_test.go index 2037b3227..f5191285e 100644 --- a/cmd/gitaly-ssh/upload_pack_test.go +++ b/cmd/gitaly-ssh/upload_pack_test.go @@ -46,7 +46,7 @@ func TestVisibilityOfHiddenRefs(t *testing.T) { require.NoError(t, err) require.NoError(t, updater.Create(git.ReferenceName(keepAroundRef), existingSha)) - require.NoError(t, updater.Wait()) + require.NoError(t, updater.Commit()) gittest.Exec(t, cfg, "-C", repoPath, "config", "transfer.hideRefs", keepAroundNamespace) |