diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-11-16 15:48:06 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-11-16 15:48:06 +0300 |
| commit | 724e844c814b91bb4a98f7eb3607756b7504657d (patch) | |
| tree | 87fdcab33ffcec1fdf7d640ad15a1fba094276c9 /internal/gitaly/service/operations | |
| parent | 8f04e23b9f004d70635aaeecd30d837a584572f8 (diff) | |
| parent | 61c5912f7d9dcb2068b04ab1594281e8d45d8975 (diff) | |
Merge branch 'pks-commit-tree-entries' into 'master'
commit: Refactor recursive `GetTreeEntries()` for efficiency
Closes #3888
See merge request gitlab-org/gitaly!4052
Diffstat (limited to 'internal/gitaly/service/operations')
| -rw-r--r-- | internal/gitaly/service/operations/submodules_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/internal/gitaly/service/operations/submodules_test.go b/internal/gitaly/service/operations/submodules_test.go index 8b2051043..c9dea3574 100644 --- a/internal/gitaly/service/operations/submodules_test.go +++ b/internal/gitaly/service/operations/submodules_test.go @@ -97,7 +97,7 @@ func TestSuccessfulUserUpdateSubmoduleRequest(t *testing.T) { parsedEntry, err := parser.NextEntry() require.NoError(t, err) require.Equal(t, testCase.submodule, parsedEntry.Path) - require.Equal(t, testCase.commitSha, parsedEntry.Oid) + require.Equal(t, testCase.commitSha, parsedEntry.ObjectID.String()) }) } } |