diff options
author | Guido Günther <agx@sigxcpu.org> | 2010-09-13 20:53:20 +0200 |
---|---|---|
committer | Guido Günther <agx@sigxcpu.org> | 2010-09-13 20:53:20 +0200 |
commit | 257a3e1f5aae069079db174ffa23c832643a485d (patch) | |
tree | d61e344ed694e77e3e3ef02d5e9ab238136e8523 | |
parent | ed97b843f16bc3253dca54a56e0ce7df587760b6 (diff) |
Switch to debian branch before forcing the HEAD update
otherwise we might forward the current branch to another branch's ref.
Thanks: Rolf Leggewie for the testcase
-rwxr-xr-x | git-import-dsc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-import-dsc b/git-import-dsc index 99da9d10..06747d5e 100755 --- a/git-import-dsc +++ b/git-import-dsc @@ -261,6 +261,7 @@ def main(argv): apply_debian_patch(repo, unpack_dir, src, options, parents) else: print >>sys.stderr, "Warning: Didn't find a diff to apply." + repo.set_branch(options.debian_branch) repo.force_head(options.debian_branch, hard=True) except KeyboardInterrupt: ret = 1 |