13497: Merge branch 'master' into 13497-controller

[arvados.git] / services / crunch-run / git_mount.go

diff --git a/services/crunch-run/git_mount.go b/services/crunch-run/git_mount.go
index 92b83710b13e9966bfba521214c1bbc50f48fd31..c312a532e44f43d63fa65b1d6ff6e7af9028a924 100644 (file)
--- a/services/crunch-run/git_mount.go
+++ b/services/crunch-run/git_mount.go
@@ -1,3 +1,7 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 package main
 
 import (
@@ -8,7 +12,7 @@ import (
        "regexp"
 
        "git.curoverse.com/arvados.git/sdk/go/arvados"
-       "gopkg.in/src-d/go-billy.v3/osfs"
+       "gopkg.in/src-d/go-billy.v4/osfs"
        git "gopkg.in/src-d/go-git.v4"
        git_config "gopkg.in/src-d/go-git.v4/config"
        git_plumbing "gopkg.in/src-d/go-git.v4/plumbing"
@@ -78,7 +82,10 @@ func (gm gitMount) extractTree(ac IArvadosClient, dir string, token string) erro
        }
        err = repo.Fetch(&git.FetchOptions{
                RemoteName: "origin",
-               Auth:       git_http.NewBasicAuth("none", token),
+               Auth: &git_http.BasicAuth{
+                       Username: "none",
+                       Password: token,
+               },
        })
        if err != nil {
                return fmt.Errorf("git fetch %q: %s", u.String(), err)