Don't hardcode pristine-tar branch

diff --git a/gbp-clone b/gbp-clone
index 552108c..73cfabf 100755 (executable)
--- a/gbp-clone
+++ b/gbp-clone
@@ -24,13 +24,13 @@ import sys
 import os, os.path
 from gbp.config import (GbpOptionParser, GbpOptionGroup)
 from gbp.git import (GitRepositoryError, GitRepository)
-from gbp.command_wrappers import (GitClone, Command, CommandExecFailed, GitBranch)
+from gbp.command_wrappers import (GitClone, Command, CommandExecFailed,
+                                  GitBranch, PristineTar)
 from gbp.errors import GbpError
 
 
 def main(argv):
     retval = 0
-    pristine_tar_branch = 'pristine-tar'
 
     parser = GbpOptionParser(command=os.path.basename(argv[0]), prefix='',
                              usage='%prog [options] repository - clone a remote repository')
@@ -73,7 +73,7 @@ def main(argv):
         repo = GitRepository(os.path.curdir)
 
         if options.pristine_tar:
-            branches += [ pristine_tar_branch ]
+            branches += [ PristineTar.branch ]
 
         for branch in branches:
             remote = 'origin/%s' % branch

diff --git a/gbp-pull b/gbp-pull
index a12de88..0352d7c 100755 (executable)
--- a/gbp-pull
+++ b/gbp-pull
@@ -22,7 +22,8 @@
 
 import sys
 import os, os.path
-from gbp.command_wrappers import (GitFetch, GitMerge, Command, CommandExecFailed)
+from gbp.command_wrappers import (GitFetch, GitMerge, Command,
+                                  CommandExecFailed, PristineTar)
 from gbp.config import (GbpOptionParser, GbpOptionGroup)
 from gbp.errors import GbpError
 from gbp.git import (GitRepositoryError, GitRepository)
@@ -46,7 +47,6 @@ def fast_forward_branch(branch, repo, options):
 def main(argv):
     changelog = 'debian/changelog'
     retval = 0
-    pristine_tar = 'pristine-tar'
 
     parser = GbpOptionParser(command=os.path.basename(argv[0]), prefix='',
                              usage='%prog [options] - safely update a repository from remote')
@@ -81,8 +81,8 @@ def main(argv):
             if repo.has_branch(branch):
                 branches += [ branch ]
 
-        if repo.has_branch(pristine_tar) and options.pristine_tar:
-            branches += [ pristine_tar ]
+        if repo.has_branch(PristineTar.branch) and options.pristine_tar:
+            branches += [ PristineTar.branch ]
 
         (ret, out) = repo.is_clean()
         if not ret: