Merge branch 'stable'

[stgit] / stgit / commands / branch.py

diff --git a/stgit/commands/branch.py b/stgit/commands/branch.py
index ef715476f10b75f868894b335c9ade5ccb466c49..3d912fc3f8ce4938900200ba6e1fd5b205c9c64f 100644 (file)
--- a/stgit/commands/branch.py
+++ b/stgit/commands/branch.py
@@ -20,7 +20,7 @@ from stgit.argparse import opt
 from stgit.commands.common import *
 from stgit.utils import *
 from stgit.out import *
 from stgit.commands.common import *
 from stgit.utils import *
 from stgit.out import *

-from stgit import stack, git, basedir
+from stgit import argparse, stack, git, basedir

 from stgit.lib import log
 
 help = 'Branch operations: switch, list, create, rename, delete, ...'
 from stgit.lib import log
 
 help = 'Branch operations: switch, list, create, rename, delete, ...'


@@ -45,6 +45,7 @@ within a git repository.
 'stg branch' <branch>::
         Switch to the given branch."""
 
 'stg branch' <branch>::
         Switch to the given branch."""
 

+args = [argparse.all_branches]

 options = [
     opt('-l', '--list', action = 'store_true',
         short = 'List the branches contained in this repository', long = """
 options = [
     opt('-l', '--list', action = 'store_true',
         short = 'List the branches contained in this repository', long = """