diff options
| author | John Cai <jcai@gitlab.com> | 2020-07-02 00:59:33 +0300 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2020-07-02 00:59:36 +0300 |
| commit | 7786621da0d5edca9bd07e7d2aedb10583d60501 (patch) | |
| tree | 2f3256f8d4a8c1cd5e5b057cfbd9df772ac114c6 | |
| parent | 66a9d21ac2a425839b3910fa2a3ba26b60b438e0 (diff) | |
Fix semantic merge conflict
ValidateRelativePath moved to the storage package. This commit fixes the
call in archive.go
| -rw-r--r-- | internal/service/repository/archive.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/internal/service/repository/archive.go b/internal/service/repository/archive.go index d72fb7706..354653126 100644 --- a/internal/service/repository/archive.go +++ b/internal/service/repository/archive.go @@ -31,7 +31,7 @@ func (s *server) GetArchive(in *gitalypb.GetArchiveRequest, stream gitalypb.Repo exclude := make([]string, len(in.GetExclude())) for i, ex := range in.GetExclude() { - exclude[i], err = helper.ValidateRelativePath(repoRoot, string(ex)) + exclude[i], err = storage.ValidateRelativePath(repoRoot, string(ex)) if err != nil { return helper.ErrInvalidArgument(err) } |