projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '13100-crunch-run-memory'
[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..2ecc8726f5e54d91518b3f20c08eb8f1dec41852 100644
(file)
--- a/
services/crunch-run/git_mount.go
+++ b/
services/crunch-run/git_mount.go
@@
-8,7
+8,7
@@
import (
"regexp"
"git.curoverse.com/arvados.git/sdk/go/arvados"
"regexp"
"git.curoverse.com/arvados.git/sdk/go/arvados"
- "gopkg.in/src-d/go-billy.v
3
/osfs"
+ "gopkg.in/src-d/go-billy.v
4
/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"
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
+78,10
@@
func (gm gitMount) extractTree(ac IArvadosClient, dir string, token string) erro
}
err = repo.Fetch(&git.FetchOptions{
RemoteName: "origin",
}
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)
})
if err != nil {
return fmt.Errorf("git fetch %q: %s", u.String(), err)