diff options
| author |   Jan Lübbe <jluebbe@debian.org> | 2008-10-04 04:59:22 +0000 |
|---|---|---|
| committer | Jan Lübbe <jluebbe@debian.org> | 2008-10-04 04:59:22 +0000 |
| commit | 24483588faaf027c968ddde444a87853a5f5de23 (patch) | |
| tree | 3cb05d38c2a21f6ee90e86718ca641b8f06abb5b /contrib/mtn2git | |
| parent | fb0dc9e5d040cfb96620b9c4f9244cd263c07346 (diff) | |
| download | openembedded-24483588faaf027c968ddde444a87853a5f5de23.tar.gz | |
mtn2git: fix importing of revisions with no ancestor
Diffstat (limited to 'contrib/mtn2git')
| -rwxr-xr-x | contrib/mtn2git/mtn2git.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/contrib/mtn2git/mtn2git.py b/contrib/mtn2git/mtn2git.py index 1de3010756..a4b43721d9 100755 --- a/contrib/mtn2git/mtn2git.py +++ b/contrib/mtn2git/mtn2git.py @@ -255,6 +255,8 @@ def fast_import(ops, revision): # could probably happen if we have more than one parent (on a merge)? cmd = [] + if len(revision["parent"]) == 0: + cmd += ["reset refs/heads/%s" % branch] cmd += ["commit refs/heads/%s" % branch] cmd += ["mark :%s" % get_mark(revision["revision"])] cmd += ["author <%s> %s" % (revision["author"], get_git_date(revision))] |