git-codereview: add [branchname] when on release branch
This behavior was changed by 2865802.
Change-Id: Ib5a254240d4e8a8254ce52929ed1ec2165d545e2
Reviewed-on: https://go-review.googlesource.com/24756
Reviewed-by: Chris Broadfoot <cbro@golang.org>
diff --git a/git-codereview/hook.go b/git-codereview/hook.go
index 04fa87c..63e8fd7 100644
--- a/git-codereview/hook.go
+++ b/git-codereview/hook.go
@@ -188,11 +188,12 @@
data = append(data[:n], fmt.Sprintf("\n\nChange-Id: I%x\n", id[:])...)
}
- // Add branch prefix to commit message if not present and not on master
- // and not a special Git fixup! or squash! commit message.
+ // Add branch prefix to commit message if not present and on a
+ // dev or release branch and not a special Git fixup! or
+ // squash! commit message.
b := CurrentBranch()
branch := strings.TrimPrefix(b.OriginBranch(), "origin/")
- if strings.HasPrefix(branch, "dev.") {
+ if strings.HasPrefix(branch, "dev.") || strings.HasPrefix(branch, "release-branch.") {
prefix := "[" + branch + "] "
if !bytes.HasPrefix(data, []byte(prefix)) && !isFixup(data) {
data = []byte(prefix + string(data))
