refactor: check for master as main branch

Signed-off-by: Sébastien Elet <sebastien@elet.fr>
SebastienElet · Jan 13, 2025 · f279bca · f279bca
1 parent 561312c
commit f279bca
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/scripts/git_hook_assert_empty_files b/scripts/git_hook_assert_empty_files
diff --git a/scripts/git_hook_assert_todoes b/scripts/git_hook_assert_todoes
@@ -1,15 +1,17 @@
 #!/usr/bin/env bash
 
+source ~/.dotfiles/scripts/git_main_branch
+
 function git_hook_assert_todoes {
   echo 'Check for todoes'
   start=$(git_main_branch)
   git diff origin/${start}... \
     -G 'TODO' \
     --name-only \
-    --relative \
-     | xargs -n1 git blame -f -n -w \
-     | grep "$(git config user.name)" \
-     | grep TODO \
-     | sed "s/.\{9\}//" \
-     | sed "s/(.*)[[:space:]]*//"
+    --relative |
+    xargs -n1 git blame -f -n -w |
+    grep "$(git config user.name)" |
+    grep TODO |
+    sed "s/.\{9\}//" |
+    sed "s/(.*)[[:space:]]*//"
 }
diff --git a/scripts/git_hook_assert_typos b/scripts/git_hook_assert_typos
diff --git a/scripts/git_hook_detect_copy_paste b/scripts/git_hook_detect_copy_paste
diff --git a/scripts/git_hook_push b/scripts/git_hook_push
diff --git a/scripts/git_main_branch b/scripts/git_main_branch
@@ -3,7 +3,7 @@
 function git_main_branch() {
   command git rev-parse --git-dir &>/dev/null || return
   local ref
-  for ref in refs/{heads,remotes/{origin,upstream}}/{main,trunk}; do
+  for ref in refs/{heads,remotes/{origin,upstream}}/{main,trunk,master}; do
     if command git show-ref -q --verify $ref; then
       echo ${ref:t}
       return