aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2009-03-25 22:03:36 +0100
committerGuido Günther <agx@sigxcpu.org>2009-03-25 22:04:44 +0100
commit74a09541157608fb12d37a41fe926ee12bfa6139 (patch)
tree6e65ee478dbdfee5ce3c4a54c3dbd900048e3305
parent8e097d526e6078cb20ea8bacf49f3ce989677cfa (diff)
don't ignore --debian-branch on import into non empty archives
-rwxr-xr-xgit-import-dsc7
1 files changed, 5 insertions, 2 deletions
diff --git a/git-import-dsc b/git-import-dsc
index a74f7b3..29fc1bc 100755
--- a/git-import-dsc
+++ b/git-import-dsc
@@ -152,8 +152,11 @@ def main(argv):
if not repo.has_tag(tag):
print "tag %s not found, importing %s tarball" % (tag, format[1])
# FIXME: this is what import-orig does - merge
- if not src.native and not is_empty:
- repo.set_branch(options.upstream_branch)
+ if not is_empty:
+ if src.native:
+ repo.set_branch(options.debian_branch)
+ else:
+ 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)