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

Update reflog message

Browse Source
This commit is contained in:
Naoki Takezoe
2017-12-12 11:39:00 +09:00
parent 1adc9b3223
commit 9a127256f3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/scala/gitbucket/core/service/MergeService.scala
View File

@@ -215,7 +215,7 @@ object MergeService{
// creates merge commit // creates merge commit
val mergeCommitId = createMergeCommit(mergeResultCommit.getTree().getId(), committer, message) val mergeCommitId = createMergeCommit(mergeResultCommit.getTree().getId(), committer, message)
// update refs // update refs
Util.updateRefs(repository, s"refs/heads/${branch}", mergeCommitId, false, committer, Some("merged")) // TODO reflog message Util.updateRefs(repository, s"refs/heads/${branch}", mergeCommitId, false, committer, Some("merged"))
} }
def rebase(committer: PersonIdent, commits: Seq[RevCommit]): Unit = { def rebase(committer: PersonIdent, commits: Seq[RevCommit]): Unit = {
@@ -246,7 +246,7 @@ object MergeService{
inserter.flush() inserter.flush()
} }
Util.updateRefs(repository, s"refs/heads/${branch}", previousId, false, committer, Some("merged")) // TODO reflog message Util.updateRefs(repository, s"refs/heads/${branch}", previousId, false, committer, Some("rebased"))
} }
def squash(message: String, committer: PersonIdent): Unit = { def squash(message: String, committer: PersonIdent): Unit = {
@@ -275,7 +275,7 @@ object MergeService{
Util.updateRefs(repository, mergedBranchName, newCommitId, true, committer) Util.updateRefs(repository, mergedBranchName, newCommitId, true, committer)
// rebase to squash commit // rebase to squash commit
Util.updateRefs(repository, s"refs/heads/${branch}", repository.resolve(mergedBranchName), false, committer, Some("merged")) // TODO reflog message Util.updateRefs(repository, s"refs/heads/${branch}", repository.resolve(mergedBranchName), false, committer, Some("squashed"))
} }
// return treeId // return treeId