Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-05 21:15:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #13)Commit from AceEditor is available.

Browse Source
This commit is contained in:
Naoki Takezoe
2014-04-24 21:49:30 +09:00
parent 3721b328a6
commit ad244adbfa
5 changed files with 79 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/scala/util/JGitUtil.scala
View File

@@ -92,8 +92,9 @@ object JGitUtil {
*
* @param viewType "image", "large" or "other"
* @param content the string content
* @param charset the character encoding
*/
case class ContentInfo(viewType: String, content: Option[String])
case class ContentInfo(viewType: String, content: Option[String], charset: Option[String])
/**
* The tag data.
@@ -480,7 +481,7 @@ object JGitUtil {
}
def createNewCommit(git: Git, inserter: ObjectInserter, headId: AnyObjectId, treeId: AnyObjectId,
fullName: String, mailAddress: String, message: String): String = {
fullName: String, mailAddress: String, message: String): ObjectId = {
val newCommit = new CommitBuilder()
newCommit.setCommitter(new PersonIdent(fullName, mailAddress))
newCommit.setAuthor(new PersonIdent(fullName, mailAddress))
@@ -498,7 +499,7 @@ object JGitUtil {
refUpdate.setNewObjectId(newHeadId)
refUpdate.update()
newHeadId.getName
newHeadId
}
/**