From fdccb95b91bd11caec08aad25139a0deed761a76 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Thu, 20 Aug 2020 10:52:00 -0400 Subject: [PATCH] gitsrht-update-hook: add deleted refs to webhook --- gitsrht-update-hook/go.mod | 1 + gitsrht-update-hook/go.sum | 3 +++ gitsrht-update-hook/post-update.go | 8 +++++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/gitsrht-update-hook/go.mod b/gitsrht-update-hook/go.mod index fcef2ee..9cca135 100644 --- a/gitsrht-update-hook/go.mod +++ b/gitsrht-update-hook/go.mod @@ -3,6 +3,7 @@ module git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-update-hook go 1.13 require ( + git.sr.ht/~sircmpwn/core-go v0.0.0-20200820135923-98806e712f5e github.com/fernet/fernet-go v0.0.0-20191111064656-eff2850e6001 github.com/go-git/go-git/v5 v5.1.0 github.com/go-redis/redis v6.15.9+incompatible diff --git a/gitsrht-update-hook/go.sum b/gitsrht-update-hook/go.sum index dafc159..246a4b5 100644 --- a/gitsrht-update-hook/go.sum +++ b/gitsrht-update-hook/go.sum @@ -1,3 +1,5 @@ +git.sr.ht/~sircmpwn/core-go v0.0.0-20200820135923-98806e712f5e h1:TJqf/neVU5peFAS9WcR1aADXcflPOvAd7ABEirmU7m0= +git.sr.ht/~sircmpwn/core-go v0.0.0-20200820135923-98806e712f5e/go.mod h1:aXSNgRsGoI3tTFKlwD0xm2htbEzKlR2xUm1osRxfhOM= github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= @@ -56,6 +58,7 @@ github.com/xanzy/ssh-agent v0.2.1 h1:TCbipTQL2JiiCprBWx9frJ2eJlCYT00NmctrHxVAr70 github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4= golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073 h1:xMPOj6Pz6UipU1wXLkrtqpHbR0AVFnyPEQq/wRWz9lM= golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de h1:ikNHVSjEfnvz6sxdSPCaPt572qowuyMDMJLLm3Db3ig= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= diff --git a/gitsrht-update-hook/post-update.go b/gitsrht-update-hook/post-update.go index 1349bd5..f99ac63 100644 --- a/gitsrht-update-hook/post-update.go +++ b/gitsrht-update-hook/post-update.go @@ -234,7 +234,13 @@ func postUpdate() { } newobj, err = repo.Object(plumbing.AnyObject, plumbing.NewHash(newref)) if err == plumbing.ErrObjectNotFound { - logger.Printf("new object %s not found", newref) + payload.Refs[i] = UpdatedRef{ + Name: refname, + New: nil, + } + if oldcommit, ok := oldobj.(*object.Commit); ok { + payload.Refs[i].Old = GitCommitToWebhookCommit(oldcommit) + } continue } -- 2.38.4