commit 807994ab3c2bcc3e42141c791c00ab50d95e6b2f
author Akron <nils@diewald-online.de> Fri May 08 09:54:47 2026 +0200
committer Akron <nils@diewald-online.de> Fri May 08 09:54:47 2026 +0200
tree edbebefd93232eace9c2fd787fb679c99af3c412
parent c7aeafd32f46c69f2e16c3966a3e3b5f220a2558

Make git-gerrit-pull main/master agnostic

Change-Id: I1d531f01994afb0851920db0be69a78cf4487276

bin/git_gerrit_pull

diff --git a/bin/git_gerrit_pull b/bin/git_gerrit_pull
index 645507b..02f1520 100755
--- a/bin/git_gerrit_pull
+++ b/bin/git_gerrit_pull
@@ -23,6 +23,24 @@
   $JAVA21_HOME = '/opt/java/jdk-21.0.0';
 };
 
+# Check which main branch exists locally
+my $branches = `git branch --list main master`;
+chomp $branches;
+
+# Split into lines and clean up formatting (remove whitespace and asterisks)
+my @branch_list = split /\n/, $branches;
+@branch_list = map { s/^\s*\*?\s*//; $_ } @branch_list;
+
+# Determine which branch to use (prefer main over master)
+my $main_branch;
+if (grep { $_ eq 'main' } @branch_list) {
+    $main_branch = 'main';
+} elsif (grep { $_ eq 'master' } @branch_list) {
+    $main_branch = 'master';
+} else {
+    die "Error: Neither 'main' nor 'master' branch found locally\n";
+}
+
 
 my $url = $ARGV[0];
 
@@ -48,9 +66,9 @@
   exit;
 };
 
-_check('git checkout master');
+_check('git checkout ' . $main_branch);
 
-_check('git pull origin master');
+_check('git pull origin ' . $main_branch);
 
 $url =~ m!KorAP/([^/]+?)/pull/(\d+?)$!;
 
@@ -88,7 +106,7 @@
 
 _check('git fetch github pull/' . $pr . '/head:' . $branch);
 _check('git checkout ' . $branch);
-_check('git rebase master');
+_check('git rebase ' . $main_branch);
 
 
 # Kustvakt
@@ -173,9 +191,9 @@
   _check('git commit -F ' . $msg_file . ' --amend');
 };
 
-_check('git push origin HEAD:refs/for/master');
+_check('git push origin HEAD:refs/for/' . $main_branch);
 
-_check('git checkout master');
+_check('git checkout ' . $main_branch);
 _check('git branch -D ' . $branch);
 
 print "\n\nEverything done - thank you!\n\n"