Merge branch 'master' into web-sign

modules/repofiles/temp_repo.go

@@ -256,6 +256,11 @@ func (t *TemporaryUploadRepository) CommitTree(author, committer *models.User, t
 	authorSig := author.NewGitSig()
 	committerSig := committer.NewGitSig()
 
+	binVersion, err := git.BinVersion()
+	if err != nil {
+		return "", fmt.Errorf("Unable to get git version: %v", err)
+	}
+
 	// Because this may call hooks we should pass in the environment
 	env := append(os.Environ(),
 		"GIT_AUTHOR_NAME="+authorSig.Name,
@@ -266,20 +271,25 @@ func (t *TemporaryUploadRepository) CommitTree(author, committer *models.User, t
 		"GIT_COMMITTER_DATE="+commitTimeStr,
 	)
 
-	args := []string{"commit-tree", treeHash, "-p", "HEAD", "-m", message}
+	messageBytes := new(bytes.Buffer)
+	_, _ = messageBytes.WriteString(message)
+	_, _ = messageBytes.WriteString("\n")
+
+	args := []string{"commit-tree", treeHash, "-p", "HEAD"}
 
 	// Determine if we should sign
 	sign, keyID := t.repo.SignCRUDAction(author, t.basePath, "HEAD")
 	if sign {
 		args = append(args, "-S"+keyID)
-	} else {
+	} else if version.Compare(binVersion, "2.0.0", ">=") {
 		args = append(args, "--no-gpg-sign")
 	}
 
-	commitHash, stderr, err := process.GetManager().ExecDirEnv(5*time.Minute,
+	commitHash, stderr, err := process.GetManager().ExecDirEnvStdIn(5*time.Minute,
 		t.basePath,
 		fmt.Sprintf("commitTree (git commit-tree): %s", t.basePath),
 		env,
+		messageBytes,
 		git.GitExecutable, args...)
 	if err != nil {
 		return "", fmt.Errorf("git commit-tree: %s", stderr)