aboutsummaryrefslogtreecommitdiffhomepage
path: root/git-import-dsc
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2008-10-31 09:59:06 +0100
committerGuido Guenther <agx@sigxcpu.org>2008-10-31 09:59:06 +0100
commitd4d45805c859bc530ed16f84079b21a57bfd0c03 (patch)
tree5704f8b419f7336bc8326042975aad8f6ed9175c /git-import-dsc
parent245d5f1ec62843ac86a5f433cdfe64021764272f (diff)
use repo.set_branch()
Diffstat (limited to 'git-import-dsc')
-rwxr-xr-xgit-import-dsc6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-import-dsc b/git-import-dsc
index 0f5e8548..e0cd5ec8 100755
--- a/git-import-dsc
+++ b/git-import-dsc
@@ -119,7 +119,7 @@ def create_debian_branch(debian_branch, dirs):
if not repo.has_branch(debian_branch):
print "Creating Debian branch '%s'" % debian_branch
gbpc.GitBranch()(debian_branch)
- gbpc.GitCheckoutBranch(debian_branch)
+ repo.set_branch(debian_branch)
os.chdir(dirs['top'])
@@ -217,14 +217,14 @@ def main(argv):
print "tag %s not found, importing %s tarball" % (tag, format[1])
# FIXME: this is what import-orig does - merge
if not src.native:
- gbpc.GitCheckoutBranch(options.upstream_branch)()
+ repo.set_branch(options.upstream_branch)
repo.replace_tree(unpack_dir, options.filters, verbose=True)
gbpc.GitCommitAll()(msg="Imported %s" % msg)
gitTag(tag, msg=msg)
if options.pristine_tar and not src.native:
gbpc.PristineTar().commit(src.tgz, options.upstream_branch)
if not src.native:
- gbpc.GitCheckoutBranch(options.debian_branch)()
+ repo.set_branch(options.debian_branch)
if options.merge:
print "Merging to %s" % options.debian_branch
try: