diff options
author | Lunny Xiao <xiaolunwen@gmail.com> | 2014-04-11 10:28:23 +0800 |
---|---|---|
committer | Lunny Xiao <xiaolunwen@gmail.com> | 2014-04-11 10:28:23 +0800 |
commit | 8cfa2be4332abdc8bdcadead36d065eab3d2d55e (patch) | |
tree | 9fe6d03f5006c3dced1f9d5102f43504fb58e8b5 /models/git.go | |
parent | db39e58a139ef8581b4b61d2d4a68b4e5324acdf (diff) | |
parent | 306aa5bffe7868207ed7b773c1aedbf3f0a659ad (diff) |
Merge branch 'dev' of github.com:gogits/gogs into dev
Diffstat (limited to 'models/git.go')
-rw-r--r-- | models/git.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/models/git.go b/models/git.go index 77b7ef2d..68e13905 100644 --- a/models/git.go +++ b/models/git.go @@ -14,6 +14,8 @@ import ( "path" "strings" + "github.com/Unknwon/com" + "github.com/gogits/git" "github.com/gogits/gogs/modules/base" @@ -163,13 +165,11 @@ func getReposFiles(userName, repoName, commitId string, rpath string) ([]*RepoFi return 0 } - cmd := exec.Command("git", "log", "-1", "--pretty=format:%H", commitId, "--", path.Join(dirname, entry.Name)) - cmd.Dir = repopath - out, err := cmd.Output() + stdout, _, err := com.ExecCmdDir(repopath, "git", "log", "-1", "--pretty=format:%H", commitId, "--", path.Join(dirname, entry.Name)) if err != nil { return 0 } - filecm, err := repo.GetCommit(string(out)) + filecm, err := repo.GetCommit(string(stdout)) if err != nil { return 0 } |