use "crt_series.get_branch()" instead of "git.get_head_file()"

More cleanup to the branch command.

Signed-off-by: Chuck Lever <cel@netapp.com>

diff --git a/stgit/commands/branch.py b/stgit/commands/branch.py
index d85ba69ad189abfc26959b715c1d74e69ee8ab65..9bf6cdbdf8777a5d45a8c3e5d886286e71336042 100644 (file)
--- a/stgit/commands/branch.py
+++ b/stgit/commands/branch.py
@@ -147,7 +147,7 @@ def func(parser, options, args):
     elif options.protect:
 
         if len(args) == 0:
     elif options.protect:
 
         if len(args) == 0:

-            branch_name = git.get_head_file()
+            branch_name = crt_series.get_branch()

         elif len(args) == 1:
             branch_name = args[0]
         else:
         elif len(args) == 1:
             branch_name = args[0]
         else:


@@ -182,7 +182,7 @@ def func(parser, options, args):
     elif options.unprotect:
 
         if len(args) == 0:
     elif options.unprotect:
 
         if len(args) == 0:

-            branch_name = git.get_head_file()
+            branch_name = crt_series.get_branch()

         elif len(args) == 1:
             branch_name = args[0]
         else:
         elif len(args) == 1:
             branch_name = args[0]
         else:


@@ -222,4 +222,4 @@ def func(parser, options, args):
     if len(args) != 0:
         parser.error('incorrect number of arguments')
 
     if len(args) != 0:
         parser.error('incorrect number of arguments')
 

-    print git.get_head_file()
+    print crt_series.get_branch()