ff

src/ffx/ffx.py

@@ -150,7 +150,7 @@ def setup_dependencies(ctx, check, prepare_args):
 
 @ffx.command(name='upgrade')
 @click.pass_context
-@click.argument('branch', required=False, default='main')
+@click.option('--branch', type=str, default='', help='Checkout this branch before pulling')
 def upgrade(ctx, branch):
     bundleRepoPath = getBundleRepoPath()
     bundlePipPath = getBundlePipPath()
@@ -161,8 +161,12 @@ def upgrade(ctx, branch):
     if not os.path.isfile(bundlePipPath):
         raise click.ClickException(f"Bundle pip not found at {bundlePipPath}")
 
-    commandSequences = [
-        ['git', 'checkout', branch],
+    commandSequences = []
+
+    if branch:
+        commandSequences.append(['git', 'checkout', branch])
+
+    commandSequences += [
         ['git', 'pull'],
         [bundlePipPath, 'install', '--editable', '.'],
     ]