foreach (Rules::Repository::Branch branchRule, rule.branches) {
Branch branch;
branch.branchFrom = branchRule.branchFrom;
+ if (!branch.branchFrom.startsWith("refs/"))
+ branch.branchFrom.prepend("refs/heads/");
branch.isCreated = false;
branches.insert(branchRule.name, branch);
branches["master"].isCreated = true;
fastImport.setWorkingDirectory(name);
- fastImport.setProcessChannelMode(QProcess::ForwardedChannels);
}
Repository::~Repository()
end = branches.end();
for ( ; it != end; ++it) {
QString branchRef = it.key();
- if (!branchRef.startsWith("refs/heads/"))
+ if (!branchRef.startsWith("refs/"))
branchRef.prepend("refs/heads/");
bool branchExists;
int revnum)
{
if (!branches.contains(branch)) {
- qCritical() << branch << "is not known in repository" << name;
+ qCritical() << branch << "is not a known branch in repository" << name;
return 0;
}
if (fastImport.state() == QProcess::NotRunning) {
// start the process
#ifndef DRY_RUN
+ fastImport.setProcessChannelMode(QProcess::ForwardedChannels);
fastImport.start("git-fast-import", QStringList());
#else
+ fastImport.setStandardOutputFile(name);
fastImport.start("/bin/cat", QStringList());
#endif
}
{
QByteArray branchRef = branch;
- if (!branchRef.startsWith("refs/heads/"))
+ if (!branchRef.startsWith("refs/"))
branchRef.prepend("refs/heads/");
QTextStream s(&repository->fastImport);