Generalize main branch logic

Author: ctrueden

check-branch.sh

@@ -4,7 +4,13 @@
 #                   recording whether the build passes or fails for each.
 
 commits=$@
-test "$commits" || commits=$(git rev-list HEAD ^master | sed '1!G;h;$!d')
+
+remote=$(git rev-parse --symbolic-full-name HEAD@{u})
+remote=${remote%/*}
+remote=${remote#refs/remotes/}
+headBranch=$(git remote show "$remote" | grep HEAD | sed 's/ *HEAD branch: //')
+
+test "$commits" || commits=$(git rev-list HEAD "^$headBranch" | sed '1!G;h;$!d')
 # NB: The sed line above reverses the order of the commits.
 # See: http://stackoverflow.com/a/744093
 

github-actionify.sh

@@ -203,7 +203,7 @@ EOL
 	# Add/update the GitHub Action setup script.
 	cat >"$tmpFile" <<EOL
 #!/bin/sh
-curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/ci-setup-github-actions.sh
+curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/main/ci-setup-github-actions.sh
 sh ci-setup-github-actions.sh
 EOL
 	chmod +x "$tmpFile"
@@ -212,7 +212,7 @@ EOL
 	# Add/update the GitHub Action build script.
 	cat >"$tmpFile" <<EOL
 #!/bin/sh
-curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/ci-build.sh
+curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/main/ci-build.sh
 sh ci-build.sh
 EOL
 	chmod +x "$tmpFile"

remote-branch-info.sh

@@ -24,10 +24,11 @@ esac
 
 for ref in $(git for-each-ref refs/remotes/$remote --format='%(refname)')
 do
-
+  headBranch=$(git remote show "$remote" | grep HEAD | sed 's/ *HEAD branch: //')
   refname=${ref#refs/remotes/$remote/}
-  case "$refname" in contrib|master) continue;; esac
-  unmerged_count=$(git cherry master $ref | grep '^+' | wc -l)
-  info=$(git log -n 1 --format='%an - %ar' $ref)
-  echo $refname - $info - $unmerged_count unmerged
-done
+  test "$refname" = "$headBranch" -o "$refname" = HEAD && continue
+  unmerged_count=$(git cherry "$headBranch" "$ref" | grep '^+' | wc -l)
+  author=$(git log -n 1 --format='%an' "$ref")
+  timestamp=$(git log -n 1 --format='%ar' "$ref")
+  echo "$refname~$author~$timestamp~$unmerged_count unmerged"
+done | column -t -s '~'