Merge branch 'dev' of https://github.com/gogits/Gogs into issue/281

Conflicts:
	modules/base/tool.go

1 files changed, 26 insertions, 0 deletions

diff --git a/modules/git/blob.go b/modules/git/blob.go
new file mode 100644
index 00000000..3ce462a3
--- /dev/null
+++ b/modules/git/blob.go
@@ -0,0 +1,26 @@
+// Copyright 2014 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package git
+
+import (
+	"bytes"
+	"errors"
+	"io"
+
+	"github.com/Unknwon/com"
+)
+
+type Blob struct {
+	repo *Repository
+	*TreeEntry
+}
+
+func (b *Blob) Data() (io.Reader, error) {
+	stdout, stderr, err := com.ExecCmdDirBytes(b.repo.Path, "git", "show", b.Id.String())
+	if err != nil {
+		return nil, errors.New(string(stderr))
+	}
+	return bytes.NewBuffer(stdout), nil
+}