From a14d9cb6eac231aec7277a45fd2d9b17c7e4e2a3 Mon Sep 17 00:00:00 2001 From: William Richard Date: Fri, 22 Oct 2021 11:19:21 -0400 Subject: [PATCH 1/4] Look for branches that are literally the word main I have a repo with many other branches that contain the string `main`, but our default branch is still master. This grep was seeing those other branches and deciding that my default branch was `main`. This tighter regex fixes that behavior for me. --- aliases/available/git.aliases.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash index 8cafa82b..67306064 100644 --- 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$'; then echo main else echo master From 98bd0ae149e7f524a6c15caec2c22d237895d4c9 Mon Sep 17 00:00:00 2001 From: William Richard Date: Mon, 25 Oct 2021 11:35:19 -0400 Subject: [PATCH 2/4] Use `/b` to find the default branch, instead of start/end of line --- aliases/available/git.aliases.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash index 67306064..04e2c8fb 100644 --- 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\b'; then echo main else echo master From daaab1b73d6fba75e939ee0472e3f1dcbf49dc80 Mon Sep 17 00:00:00 2001 From: William Richard Date: Mon, 25 Oct 2021 11:55:26 -0400 Subject: [PATCH 3/4] Use \s instead of \b \b matches things like - and _, which is often used in branch names --- aliases/available/git.aliases.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash index 04e2c8fb..a1492258 100644 --- 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\b'; then + if git branch | grep -q '\smain\s'; then echo main else echo master From 2a235988736887bfb80634f63c47b153c0ade851 Mon Sep 17 00:00:00 2001 From: William Richard Date: Mon, 15 Nov 2021 12:19:05 -0500 Subject: [PATCH 4/4] Make the regex looking for the main branch match the entire line --- aliases/available/git.aliases.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash index a1492258..dd7331e1 100644 --- 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 '\smain\s'; then + if git branch | grep -q '^. main\s*$'; then echo main else echo master