From 7d732b9303f440f64de5176be4a3d08f665784bc Mon Sep 17 00:00:00 2001
From: Wojtek Kosior <koszko@koszko.org>
Date: Sun, 28 Apr 2024 17:48:04 +0200
Subject: Employ a separate set of personal branches.

---
 koszko-rebase.sh | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

(limited to 'koszko-rebase.sh')

diff --git a/koszko-rebase.sh b/koszko-rebase.sh
index 6f6855f6e2..41cb73dbde 100755
--- a/koszko-rebase.sh
+++ b/koszko-rebase.sh
@@ -9,29 +9,42 @@ KOSZKO_BRANCHES="readme pantalaimon cgit exim ca certbot overlayfs extra-groups
 guile-libraries localhost-repo-server vpath-builds sqlite-register-renamed ldap
 gmnisrv"
 
+KOSZKO_PERSONAL_BRANCHES="websites"
+
 cd "$(dirname "$0")"
 
 git checkout koszko
 git reset --hard master
 
-for BRANCH_SUFFIX in $KOSZKO_BRANCHES; do
-    git checkout koszko-"$BRANCH_SUFFIX"
+rebase_branches() {
+    BUILDUP_BRANCH="$(git status | awk '/^On branch /{print $3}')"
+    [ "x$BUILDUP_BRANCH" != x ]
+
+    git checkout koszko-"$1"
     git rebase master
 
     git checkout koszko-work
-    git reset --hard koszko-"$BRANCH_SUFFIX"
-    git rebase koszko
-    git checkout koszko
+    git reset --hard koszko-"$1"
+    git rebase "$BUILDUP_BRANCH"
+    git checkout "$BUILDUP_BRANCH"
     git reset --hard koszko-work
+}
+
+for BRANCH_SUFFIX in $KOSZKO_BRANCHES; do
+    rebase_branches "$BRANCH_SUFFIX"
 done
 
 git rm .guix-authorizations
 
 git commit -m "Allow unauthorized \`guix pull\`"
 
-git checkout koszko-localhost-urls
+git checkout koszko-personal
 git reset --hard koszko
 
+for BRANCH_SUFFIX in $KOSZKO_PERSONAL_BRANCHES; do
+    rebase_branches "$BRANCH_SUFFIX"
+done
+
 MODIFIED="$(grep 'url "https://git.koszko.org' gnu/packages/*.scm |
                 awk -F: '{print $1}' | sort | uniq)"
 
-- 
cgit v1.2.3