diff options
| author | Guido Günther <agx@sigxcpu.org> | 2010-12-23 22:14:20 +0100 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2010-12-24 09:29:24 +0100 |
| commit | 7e697a9ed9f4ce0044d74d96860751c53bea4202 (patch) | |
| tree | 9be67927e27f77fa3cdb73ba78ddfdb9e1ebae8d /git-import-dsc | |
| parent | 6c504960bb38ba97732e595e756cc4cea2d56bb0 (diff) | |
Update the repo after the first import
so master matches the debian branch.
Thanks: Rob Browning for the testcase
Diffstat (limited to 'git-import-dsc')
| -rwxr-xr-x | git-import-dsc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-import-dsc b/git-import-dsc index c93f01be..eb2265b1 100755 --- a/git-import-dsc +++ b/git-import-dsc @@ -278,7 +278,7 @@ def main(argv): apply_debian_patch(repo, unpack_dir, src, options, parents) else: gbp.log.warn("Didn't find a diff to apply.") - if repo.get_branch() == options.debian_branch: + if repo.get_branch() == options.debian_branch or is_empty: # Update HEAD if we modified the checkout out branch repo.force_head(options.debian_branch, hard=True) except KeyboardInterrupt: |