better logic for which branch should be the parent when creating a branch

1 files changed, 5 insertions, 1 deletions

diff --git a/bin/gitify b/bin/gitify
index a05ae97..80f85af 100755
--- a/bin/gitify
+++ b/bin/gitify
@@ -32,6 +32,7 @@ main() {
 	cd "$1"
 	git init
 	echo 'ref: refs/heads/PROGRAMS/CVTUTF' > .git/HEAD
+	lastbranch=PROGRAMS/CVTUTF
 	git commit --allow-empty -m 'initial commit'
 
 	for snapshot in "$top"/dat/pools/snaps/*; do
@@ -42,7 +43,7 @@ main() {
 
 		branch=$dirpart
 		newbranch=true
-		git checkout PROGRAMS/CVTUTF
+		git checkout "$lastbranch"
 		git checkout -b "$branch" || newbranch=false
 		git checkout "$branch"
 
@@ -74,6 +75,9 @@ main() {
 			export GIT_AUTHOR_DATE=$gitdate
 			export GIT_COMMITTER_DATE=$gitdate
 			git commit --allow-empty -m "$msg"
+			if [[ "$branch" != *.OLD ]]; then
+				lastbranch="$branch"
+			fi
 		fi
 	done
 }