coolaj86
/
gitroast
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bug fix

This commit is contained in:
Unknown 2014-03-17 15:58:32 -04:00
parent 971cd87cc6
commit 97b7cb0dca
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
models/repo.go
View File

@ -63,6 +63,21 @@ func init() {
Licenses = strings.Split(base.Cfg.MustValue("repository", "LICENSES"), "|") Licenses = strings.Split(base.Cfg.MustValue("repository", "LICENSES"), "|")
zip.Verbose = false zip.Verbose = false
// Check if server has basic git setting.
stdout, _, err := com.ExecCmd("git", "config", "--get", "user.name")
if err != nil {
fmt.Printf("repo.init(fail to get git user.name): %v", err)
os.Exit(2)
} else if len(stdout) == 0 {
if _, _, err = com.ExecCmd("git", "config", "--global", "user.email", "gogitservice@gmail.com"); err != nil {
fmt.Printf("repo.init(fail to set git user.email): %v", err)
os.Exit(2)
} else if _, _, err = com.ExecCmd("git", "config", "--global", "user.name", "Gogs"); err != nil {
fmt.Printf("repo.init(fail to set git user.name): %v", err)
os.Exit(2)
}
}
} }
// IsRepositoryExist returns true if the repository with given name under user has already existed. // IsRepositoryExist returns true if the repository with given name under user has already existed.
@ -182,23 +197,21 @@ func initRepoCommit(tmpPath string, sig *git.Signature) error {
} }
defer os.Chdir(curPath) defer os.Chdir(curPath)
var stdout, stderr string var stderr string
if stdout, stderr, err = com.ExecCmd("git", "add", "--all"); err != nil { if _, stderr, err = com.ExecCmd("git", "add", "--all"); err != nil {
return err return err
} }
log.Info("stdout(1): %s", stdout) // log.Info("stderr(1): %s", stderr)
log.Info("stderr(1): %s", stderr) if _, stderr, err = com.ExecCmd("git", "commit", fmt.Sprintf("--author='%s <%s>'", sig.Name, sig.Email),
if stdout, stderr, err = com.ExecCmd("git", "commit", fmt.Sprintf("--author='%s <%s>'", sig.Name, sig.Email),
"-m", "Init commit"); err != nil { "-m", "Init commit"); err != nil {
return err return err
} }
log.Info("stdout(2): %s", stdout) // log.Info("stderr(2): %s", stderr)
log.Info("stderr(2): %s", stderr) if _, stderr, err = com.ExecCmd("git", "push", "origin", "master"); err != nil {
if stdout, stderr, err = com.ExecCmd("git", "push", "origin", "master"); err != nil {
return err return err
} }
log.Info("stdout(3): %s", stdout) // log.Info("stderr(3): %s", stderr)
log.Info("stderr(3): %s", stderr) _ = stderr
return nil return nil
} }