diff options
Diffstat (limited to 'git-codereview/hook.go')
| -rw-r--r-- | git-codereview/hook.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/git-codereview/hook.go b/git-codereview/hook.go index be2b699..0634687 100644 --- a/git-codereview/hook.go +++ b/git-codereview/hook.go @@ -227,7 +227,8 @@ func fixCommitMessage(msg []byte) []byte { data[eol+1] = '\n' } - issueRepo := config()["issuerepo"] + cfg := config() + issueRepo := cfg["issuerepo"] // Update issue references to point to issue repo, if set. if issueRepo != "" { data = issueRefRE.ReplaceAll(data, []byte("${space}"+issueRepo+"${ref}")) @@ -259,7 +260,8 @@ func fixCommitMessage(msg []byte) []byte { // dev or release branch and not a special Git fixup! or // squash! commit message. b := CurrentBranch() - branch := strings.TrimPrefix(b.OriginBranch(), "origin/") + cfgRemote := cfg["remote"] + branch := strings.TrimPrefix(b.OriginBranch(), cfgRemote+"/") if strings.HasPrefix(branch, "dev.") || strings.HasPrefix(branch, "release-branch.") { prefix := "[" + branch + "] " if !bytes.HasPrefix(data, []byte(prefix)) && !isFixup(data) { |