diff options
| author | Torgny Nyblom <nyblom@kde.org> | 2012-08-21 16:42:44 +0200 |
|---|---|---|
| committer | Torgny Nyblom <nyblom@kde.org> | 2012-08-21 16:42:44 +0200 |
| commit | b46f9a8efb1799fc904150a4e2df4c055e29e8f7 (patch) | |
| tree | ba7833e098ea69a9db25f5b4ed18f0d4161d847b /src/repository.cpp | |
| parent | 38a1db5a45a5f727563fd3b26148766dce835173 (diff) | |
| parent | 2ce7467917ef046dd9abfb1eb5464cd1ee7c7726 (diff) | |
| download | svn2git-b46f9a8efb1799fc904150a4e2df4c055e29e8f7.tar svn2git-b46f9a8efb1799fc904150a4e2df4c055e29e8f7.tar.gz svn2git-b46f9a8efb1799fc904150a4e2df4c055e29e8f7.tar.bz2 svn2git-b46f9a8efb1799fc904150a4e2df4c055e29e8f7.tar.xz svn2git-b46f9a8efb1799fc904150a4e2df4c055e29e8f7.zip | |
Merge commit 'refs/merge-requests/13' of git://gitorious.org/svn2git/svn2git into merge-requests/13
Diffstat (limited to 'src/repository.cpp')
| -rw-r--r-- | src/repository.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/repository.cpp b/src/repository.cpp index beb8caf..8f64c28 100644 --- a/src/repository.cpp +++ b/src/repository.cpp @@ -67,13 +67,14 @@ Repository::Repository(const Rules::Repository &rule) { foreach (Rules::Repository::Branch branchRule, rule.branches) { Branch branch; - branch.created = 0; // not created + branch.created = 1; branches.insert(branchRule.name, branch); } - // create the default branch - branches["master"].created = 1; + // create the default branch if no branches were manually specified + if (rule.branches.length() == 0) + branches["master"].created = 1; fastImport.setWorkingDirectory(name); if (!CommandLineParser::instance()->contains("dry-run")) { |