lunny/git-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use the global *transfer.Manifest setup in commands.Run()

Browse Source
This commit is contained in:
risk danger olson 2016-08-10 09:42:40 -06:00
parent 6a8e9d3f8e
commit d3c57fc51b
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
commands/command_checkout.go
View File

@ -11,7 +11,6 @@ import (
"github.com/github/git-lfs/git"
"github.com/github/git-lfs/lfs"
"github.com/github/git-lfs/progress"
"github.com/github/git-lfs/transfer"
"github.com/rubyist/tracerx"
"github.com/spf13/cobra"
)
@ -166,8 +165,6 @@ func checkoutWithChan(in <-chan *lfs.WrappedPointer) {
// As files come in, write them to the wd and update the index
manifest := transfer.ConfigureManifest(transfer.NewManifest(), cfg)
for pointer := range in {
// Check the content - either missing or still this pointer (not exist is ok)
@ -190,7 +187,7 @@ func checkoutWithChan(in <-chan *lfs.WrappedPointer) {
repopathchan <- pointer.Name
cwdfilepath := <-cwdpathchan
err = lfs.PointerSmudgeToFile(cwdfilepath, pointer.Pointer, false, manifest, nil)
err = lfs.PointerSmudgeToFile(cwdfilepath, pointer.Pointer, false, transfermanifest, nil)
if err != nil {
if errutil.IsDownloadDeclinedError(err) {
// acceptable error, data not local (fetch not run or include/exclude)

4
commands/command_smudge.go
View File

@ -8,7 +8,6 @@ import (
"github.com/github/git-lfs/errutil"
"github.com/github/git-lfs/lfs"
"github.com/github/git-lfs/transfer"
"github.com/spf13/cobra"
)
@ -64,8 +63,7 @@ func smudgeCommand(cmd *cobra.Command, args []string) {
download = false
}
manifest := transfer.ConfigureManifest(transfer.NewManifest(), cfg)
err = ptr.Smudge(os.Stdout, filename, download, manifest, cb)
err = ptr.Smudge(os.Stdout, filename, download, transfermanifest, cb)
if file != nil {
file.Close()
}