Skip to content

Commit

Permalink
Merge branch 'master' into fix-13618-do-not-add-current-file-to-dump
Browse files Browse the repository at this point in the history
  • Loading branch information
6543 authored Feb 7, 2021
2 parents c430991 + e65cfab commit abc7211
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions modules/git/blob_nogogit.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ import (
"io"
"strconv"
"strings"

gitea_log "code.gitea.io/gitea/modules/log"
)

// Blob represents a Git object.
Expand All @@ -35,7 +33,6 @@ func (b *Blob) DataAsync() (io.ReadCloser, error) {
err := NewCommand("cat-file", "--batch").RunInDirFullPipeline(b.repoPath, stdoutWriter, stderr, strings.NewReader(b.ID.String()+"\n"))
if err != nil {
err = ConcatenateError(err, stderr.String())
gitea_log.Error("Blob.DataAsync Error: %v", err)
_ = stdoutWriter.CloseWithError(err)
} else {
_ = stdoutWriter.Close()
Expand Down

0 comments on commit abc7211

Please sign in to comment.