From 1eb13173183cf402e4197be51935a4b3ddacf256 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Mur=C3=A9?= Date: Sun, 4 Oct 2020 20:03:44 +0200 Subject: [PATCH] repo: fix missing keyring on the go-git repo --- repository/gogit.go | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/repository/gogit.go b/repository/gogit.go index 8fb7c52a33bec7083128d8d555b63015c6404918..c0179628b60525e8d0f6dfba381144c35f166e33 100644 --- a/repository/gogit.go +++ b/repository/gogit.go @@ -138,10 +138,16 @@ func InitGoGitRepo(path string) (*GoGitRepo, error) { return nil, err } + k, err := defaultKeyring() + if err != nil { + return nil, err + } + return &GoGitRepo{ - r: r, - path: path + "/.git", - clocks: make(map[string]lamport.Clock), + r: r, + path: path + "/.git", + clocks: make(map[string]lamport.Clock), + keyring: k, }, nil } @@ -152,10 +158,16 @@ func InitBareGoGitRepo(path string) (*GoGitRepo, error) { return nil, err } + k, err := defaultKeyring() + if err != nil { + return nil, err + } + return &GoGitRepo{ - r: r, - path: path, - clocks: make(map[string]lamport.Clock), + r: r, + path: path, + clocks: make(map[string]lamport.Clock), + keyring: k, }, nil }