Fixed bug with branch regex (#1)

claesgill · Sep 26, 2020 · c704005 · c704005
1 parent 83ea13a
commit c704005
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [0.0.2]
+
+### Fixed
+- Fixed bug with branch regex #1
+
 ## [0.0.1]
 
 

diff --git a/Makefile b/Makefile
@@ -1,5 +1,7 @@
 all: build run move
 
+dev: build run
+
 run:
 	@./bin/gp -status
 

diff --git a/bin/gp b/bin/gp
diff --git a/main.go b/main.go
@@ -18,7 +18,7 @@ func main() {
 	status := flag.Bool("status", false, "formatting git status if any")
 	flag.Parse()
 	if *vers == true {
-		fmt.Println("Git Prettier version v0.0.1")
+		fmt.Println("Git Prettier version v0.0.2")
 		os.Exit(1)
 	}
 	if *status {
@@ -36,7 +36,9 @@ func gitBranch() (string){
 	cmd := exec.Command("git", "branch")
 	output, err := cmd.Output()
 	if err != nil {}
-	branch := strings.Split(string(output[:]), "* ")
+	rBranch    := regexp.MustCompile(`^\*\s.*`)
+	branch     := rBranch.FindAllString(string(output[:]), 1000)
+	branch     = strings.Split(strings.Join(branch, ""), "* ")
 	parsBranch := strings.Join(branch, "")
 	return strings.TrimSuffix(parsBranch, "\n")
 }