Skip to content

Commit

Permalink
Merge pull request #3100 from ipfs/feat/disable-cat-gc
Browse files Browse the repository at this point in the history
ipfs/cat: disable auto-gc check
  • Loading branch information
whyrusleeping committed Aug 19, 2016
2 parents 7397dd3 + 115bee5 commit 7276fd8
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions core/commands/cat.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (

cmds "github.com/ipfs/go-ipfs/commands"
core "github.com/ipfs/go-ipfs/core"
"github.com/ipfs/go-ipfs/core/corerepo"
coreunix "github.com/ipfs/go-ipfs/core/coreunix"

context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
Expand Down Expand Up @@ -42,10 +41,13 @@ var CatCmd = &cmds.Command{
return
}

if err := corerepo.ConditionalGC(req.Context(), node, length); err != nil {
res.SetError(err, cmds.ErrNormal)
return
}
/*
if err := corerepo.ConditionalGC(req.Context(), node, length); err != nil {
res.SetError(err, cmds.ErrNormal)
return
}
*/

res.SetLength(length)

reader := io.MultiReader(readers...)
Expand Down

0 comments on commit 7276fd8

Please sign in to comment.