Merge pull request #1981 from william-richard/make-default-branch-match-exactly-main

NoahGorny · web-flow · commit 447c89aa0e6b · 2021-11-16T20:09:22.000+02:00
Look for branches that are literally the word main
diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash
@@ -199,7 +199,7 @@ function gdv() {
 }
 
 function get_default_branch() {
-	if git branch | grep -q main; then
+	if git branch | grep -q '^. main\s*$'; then
 		echo main
 	else
 		echo master

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ function gdv() {`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`function get_default_branch() {`
`202`		`- if git branch \| grep -q main; then`
	`202`	`+ if git branch \| grep -q '^. main\s*$'; then`
`203`	`203`	`echo main`
`204`	`204`	`else`
`205`	`205`	`echo master`