Skip to content

Commit 83fa386

Browse files
author
mritd
committed
feat(hotfix): add hotfix command
add hotfix command Signed-off-by: mritd <[email protected]>
1 parent 25cedc4 commit 83fa386

File tree

8 files changed

+55
-9
lines changed

8 files changed

+55
-9
lines changed

cmd/hotfix.go

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
// Copyright © 2018 mritd <[email protected]>
2+
//
3+
// Permission is hereby granted, free of charge, to any person obtaining a copy
4+
// of this software and associated documentation files (the "Software"), to deal
5+
// in the Software without restriction, including without limitation the rights
6+
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7+
// copies of the Software, and to permit persons to whom the Software is
8+
// furnished to do so, subject to the following conditions:
9+
//
10+
// The above copyright notice and this permission notice shall be included in
11+
// all copies or substantial portions of the Software.
12+
//
13+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18+
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
19+
// THE SOFTWARE.
20+
21+
package cmd
22+
23+
import (
24+
"fmt"
25+
"os"
26+
27+
"github.com/mritd/gitflow-toolkit/pkg/consts"
28+
"github.com/mritd/gitflow-toolkit/pkg/util"
29+
"github.com/spf13/cobra"
30+
)
31+
32+
func NewHotFix() *cobra.Command {
33+
return &cobra.Command{
34+
Use: "hotfix",
35+
Short: "创建 hotfix 分支",
36+
Long: `
37+
创建一个以 hotfix 开头的分支,通常用于对 master 的紧急修复`,
38+
Aliases: []string{"git-hotfix"},
39+
Run: func(cmd *cobra.Command, args []string) {
40+
if len(args) != 1 {
41+
fmt.Println("branch name is blank")
42+
os.Exit(1)
43+
}
44+
util.Checkout(consts.HOTFIX, args[0])
45+
},
46+
}
47+
}

cmd/root.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ func init() {
5757
RootCmd.AddCommand(NewStyle())
5858
RootCmd.AddCommand(NewRefactor())
5959
RootCmd.AddCommand(NewPerf())
60+
RootCmd.AddCommand(NewHotFix())
6061
RootCmd.AddCommand(NewTest())
6162
RootCmd.AddCommand(NewChore())
6263
RootCmd.AddCommand(NewInstall())

glide.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

glide.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import:
33
- package: github.com/mritd/readline
44
version: ae245b60ddeb65cbbbe2b42da961f46d0b812f43
55
- package: github.com/mritd/promptx
6-
version: 417c1838d34bce59519830b1b8669c3eefbfcb6c
6+
version: cd327e50600f1fc3e5ff14d047b127ad6a0c1fbd
77
- package: github.com/cpuguy83/go-md2man
88
version: 48d8747a2ca13185e7cc8efe6e9fc196a83f71a5
99
subpackages:

main.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,3 @@ func main() {
4545
basename := filepath.Base(os.Args[0])
4646
util.CheckAndExit(commandFor(basename, cmd.RootCmd).Execute())
4747
}
48-
49-
//func main() {
50-
// commit.TRun()
51-
//}

pkg/consts/consts.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ const (
1515
TEST CommitType = "test"
1616
CHORE CommitType = "chore"
1717
PERF CommitType = "perf"
18+
HOTFIX CommitType = "hotfix"
1819
EXIT CommitType = "exit"
1920
)
2021

pkg/util/common.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ func BinPaths() *[]string {
5454
"/usr/local/bin/git-test",
5555
"/usr/local/bin/git-chore",
5656
"/usr/local/bin/git-perf",
57+
"/usr/local/bin/git-hotfix",
5758
"/usr/local/bin/git-xmr",
5859
"/usr/local/bin/git-xpr",
5960
}

vendor/github.com/mritd/promptx/select.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)