Skip to content

Commit 5e7b220

Browse files
committed
CreateBranch-hook has shasum. Use the full ref for fetching shasum
1 parent 55bd3ed commit 5e7b220

File tree

1 file changed

+19
-1
lines changed

1 file changed

+19
-1
lines changed

models/action.go

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,6 +540,8 @@ func CommitRepoAction(opts CommitRepoActionOptions) error {
540540

541541
apiPusher := pusher.APIFormat()
542542
apiRepo := repo.APIFormat(nil)
543+
544+
var shaSum string
543545
switch opType {
544546
case ActionCommitRepo: // Push
545547
if err = PrepareWebhooks(repo, HookEventPush, &api.PushPayload{
@@ -556,16 +558,32 @@ func CommitRepoAction(opts CommitRepoActionOptions) error {
556558
}
557559

558560
if isNewBranch {
561+
gitRepo, err := git.OpenRepository(repo.RepoPath())
562+
if err != nil {
563+
log.Error(4, "OpenRepository[%s]: %v", repo.RepoPath(), err)
564+
}
565+
shaSum, err = gitRepo.GetBranchCommitID(opts.RefFullName)
566+
if err != nil {
567+
log.Error(4, "GetBranchCommitID[%s]: %v", opts.RefFullName, err)
568+
}
559569
return PrepareWebhooks(repo, HookEventCreate, &api.CreatePayload{
560570
Ref: refName,
571+
Sha: shaSum,
561572
RefType: "branch",
562573
Repo: apiRepo,
563574
Sender: apiPusher,
564575
})
565576
}
566577

567578
case ActionPushTag: // Create
568-
shaSum := git.OpenRepository(repo.RepoPath()).GetTagCommitID(refName)
579+
gitRepo, err := git.OpenRepository(repo.RepoPath())
580+
if err != nil {
581+
log.Error(4, "OpenRepository[%s]: %v", repo.RepoPath(), err)
582+
}
583+
shaSum, err = gitRepo.GetTagCommitID(opts.RefFullName)
584+
if err != nil {
585+
log.Error(4, "GetTagCommitID[%s]: %v", opts.RefFullName, err)
586+
}
569587
return PrepareWebhooks(repo, HookEventCreate, &api.CreatePayload{
570588
Ref: refName,
571589
Sha: shaSum,

0 commit comments

Comments
 (0)