diff options
| -rw-r--r-- | src/repository.cpp | 7 | ||||
| -rw-r--r-- | src/svn.cpp | 3 |
2 files changed, 7 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")) { diff --git a/src/svn.cpp b/src/svn.cpp index c103728..6c61e3c 100644 --- a/src/svn.cpp +++ b/src/svn.cpp @@ -821,6 +821,9 @@ int SvnRevision::recurse(const char *path, const svn_fs_path_change_t *change, if(kind == svn_node_none) { qWarning() << "WARN: Trying to recurse using a nonexistant path" << path << ", ignoring"; return EXIT_SUCCESS; + } else if(kind != svn_node_dir) { + qWarning() << "WARN: Trying to recurse using a non-directory path" << path << ", ignoring"; + return EXIT_SUCCESS; } SVN_ERR(svn_fs_dir_entries(&entries, fs_root, path, pool)); |