improv: use default branch also when forking

Author: chrisgrieser

info.plist

@@ -1915,41 +1915,41 @@ end run</string>
 			<key>config</key>
 			<dict>
 				<key>default</key>
-				<false/>
+				<string></string>
+				<key>placeholder</key>
+				<string>dev</string>
 				<key>required</key>
 				<false/>
-				<key>text</key>
-				<string>fork when not owner</string>
+				<key>trim</key>
+				<true/>
 			</dict>
 			<key>description</key>
-			<string>When cloning a repository that you do not own, also create a fork and prepare the repo for e PR. (Requires the `gh` cli.)</string>
+			<string>working branch: If this branch exists, will switch to it after cloning. Leave empty to disable.</string>
 			<key>label</key>
 			<string></string>
 			<key>type</key>
-			<string>checkbox</string>
+			<string>textfield</string>
 			<key>variable</key>
-			<string>fork_on_clone</string>
+			<string>working_branch</string>
 		</dict>
 		<dict>
 			<key>config</key>
 			<dict>
 				<key>default</key>
-				<string></string>
-				<key>placeholder</key>
-				<string>dev</string>
+				<false/>
 				<key>required</key>
 				<false/>
-				<key>trim</key>
-				<true/>
+				<key>text</key>
+				<string>fork when not owner</string>
 			</dict>
 			<key>description</key>
-			<string>Branch: If this branch exists, will switch to it after cloning. Leave empty to disable.</string>
+			<string>When cloning a repository that you do not own, also create a fork, set upstream &amp; origin for a PR, and switch to the working branch (if set). Requires the `gh` cli.</string>
 			<key>label</key>
 			<string></string>
 			<key>type</key>
-			<string>textfield</string>
+			<string>checkbox</string>
 			<key>variable</key>
-			<string>default_branch</string>
+			<string>fork_on_clone</string>
 		</dict>
 		<dict>
 			<key>config</key>

scripts/clone-repo.sh

@@ -36,9 +36,9 @@ cd "$reponame" || return 1
 #───────────────────────────────────────────────────────────────────────────────
 
 # SWITCH TO DEFAULT BRANCH
-if [[ -n "$default_branch" ]]; then
+if [[ -n "$working_branch" ]]; then
 	# `git switch` fails silently if the branch does not exist
-	git switch "$default_branch" &> /dev/null
+	git switch "$working_branch" &> /dev/null
 fi
 
 # RESTORE MTIME
@@ -64,6 +64,8 @@ if [[ "$ownerOfRepo" != "true" && "$fork_on_clone" == "1" ]]; then
 	gh repo set-default "$source_repo" # where `gh` sends PRs to
 
 	# switch to new branch
-	git config push.autoSetupRemote true
-	git checkout -b "dev"
+	if [[ -n "$working_branch" ]]; then
+		git config push.autoSetupRemote true
+		git checkout -b "$working_branch"
+	fi
 fi