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

(refs #13)Bug fix

Browse Source
This commit is contained in:
takezoe
2014-04-28 01:33:13 +09:00
parent a97edb7ef5
commit 7da2c650d2
3 changed files with 42 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/scala/app/RepositoryViewerController.scala
View File

@@ -356,7 +356,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
repo.html.files(revision, repository,
if(path == ".") Nil else path.split("/").toList, // current path
new JGitUtil.CommitInfo(revCommit), // latest commit
files, readme)
files, readme, hasWritePermission(repository.owner, repository.name, context.loginAccount))
}
} getOrElse NotFound
}
@@ -379,7 +379,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
val headTip = git.getRepository.resolve(s"refs/heads/${branch}")
JGitUtil.processTree(git, headTip){ (path, tree) =>
if(path != newPath && !oldPath.exists(_ == path)){
if(!newPath.exists(_ == path) && !oldPath.exists(_ == path)){
builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
}
}
@@ -387,8 +387,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
newPath.foreach { newPath =>
builder.add(JGitUtil.createDirCacheEntry(newPath, FileMode.REGULAR_FILE,
inserter.insert(Constants.OBJ_BLOB, content.getBytes(charset))))
builder.finish()
}
builder.finish()
val commitId = JGitUtil.createNewCommit(git, inserter, headTip, builder.getDirCache.writeTree(inserter),
loginAccount.fullName, loginAccount.mailAddress, message)