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

CreateBranch-hook has shasum. Use the full ref for fetching shasum

This commit is contained in:
Kim "BKC" Carlbäcker 2016-11-29 09:13:30 +01:00
parent 57dc9efaae
commit dad806d3ea
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
models/action.go
View File

@ -540,6 +540,8 @@ func CommitRepoAction(opts CommitRepoActionOptions) error {
apiPusher := pusher.APIFormat() apiPusher := pusher.APIFormat()
apiRepo := repo.APIFormat(nil) apiRepo := repo.APIFormat(nil)
var shaSum string
switch opType { switch opType {
case ActionCommitRepo: // Push case ActionCommitRepo: // Push
if err = PrepareWebhooks(repo, HookEventPush, &api.PushPayload{ if err = PrepareWebhooks(repo, HookEventPush, &api.PushPayload{
@ -556,8 +558,17 @@ func CommitRepoAction(opts CommitRepoActionOptions) error {
} }
if isNewBranch { if isNewBranch {
gitRepo, err := git.OpenRepository(repo.RepoPath())
if err != nil {
log.Error(4, "OpenRepository[%s]: %v", repo.RepoPath(), err)
}
shaSum, err = gitRepo.GetBranchCommitID(opts.RefFullName)
if err != nil {
log.Error(4, "GetBranchCommitID[%s]: %v", opts.RefFullName, err)
}
return PrepareWebhooks(repo, HookEventCreate, &api.CreatePayload{ return PrepareWebhooks(repo, HookEventCreate, &api.CreatePayload{
Ref: refName, Ref: refName,
Sha: shaSum,
RefType: "branch", RefType: "branch",
Repo: apiRepo, Repo: apiRepo,
Sender: apiPusher, Sender: apiPusher,
@ -565,7 +576,14 @@ func CommitRepoAction(opts CommitRepoActionOptions) error {
} }
case ActionPushTag: // Create case ActionPushTag: // Create
shaSum := git.OpenRepository(repo.RepoPath()).GetTagCommitID(refName) gitRepo, err := git.OpenRepository(repo.RepoPath())
if err != nil {
log.Error(4, "OpenRepository[%s]: %v", repo.RepoPath(), err)
}
shaSum, err = gitRepo.GetTagCommitID(opts.RefFullName)
if err != nil {
log.Error(4, "GetTagCommitID[%s]: %v", opts.RefFullName, err)
}
return PrepareWebhooks(repo, HookEventCreate, &api.CreatePayload{ return PrepareWebhooks(repo, HookEventCreate, &api.CreatePayload{
Ref: refName, Ref: refName,
Sha: shaSum, Sha: shaSum,