Commit 381be06

gabyxtnyblom

authored and

committed

Do not warn the user if default branch does not exist

1 parent 58839fa commit 381be06Copy full SHA for 381be06

File tree

1 file changed

-7

lines changed

src
- repository.cpp

1 file changed

-7

lines changed

`‎src/repository.cpp`

Lines changed: 9 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -134,6 +134,7 @@ class FastImportRepository : public Repository`
`134`	`134`	`QVector<int> marks;`
`135`	`135`	`};`
`136`	`136`
	`137`	`+ QString defaultBranch;`
`137`	`138`	`QHash<QString, Branch> branches;`
`138`	`139`	`QHash<QString, QByteArray> branchNotes;`
`139`	`140`	`QHash<QString, AnnotatedTag> annotatedTags;`
`@@ -351,15 +352,15 @@ FastImportRepository::FastImportRepository(const Rules::Repository &rule)`
`351`	`352`	`QProcess config;`
`352`	`353`	`config.start("git", QStringList() << "config" << "init.defaultBranch");`
`353`	`354`	`config.waitForFinished(-1);`
`354`		`- QString defaultBranch = QString(config.readAllStandardOutput()).trimmed();`
	`355`	`+ defaultBranch = QString(config.readAllStandardOutput()).trimmed();`
`355`	`356`
`356`	`357`	`// Create the default branch`
`357`	`358`	`if (defaultBranch.isEmpty()) {`
`358`		`- branches["master"].created = 1;`
`359`		`- } else {`
`360`		`- branches[defaultBranch].created = 1;`
	`359`	`+ defaultBranch = "master";`
`361`	`360`	`}`
`362`	`361`
	`362`	`+ branches[defaultBranch].created = 1;`
	`363`	`+`
`363`	`364`	`if (!CommandLineParser::instance()->contains("dry-run") && !CommandLineParser::instance()->contains("create-dump")) {`
`364`	`365`	`fastImport.setWorkingDirectory(name);`
`365`	`366`	`if (!QDir(name).exists()) { // repo doesn't exist yet.`
`@@ -756,7 +757,7 @@ void FastImportRepository::commit()`
`756`	`757`	`Repository::Transaction *FastImportRepository::newTransaction(const QString &branch, const QString &svnprefix,`
`757`	`758`	`int revnum)`
`758`	`759`	`{`
`759`		`- if (!branches.contains(branch)) {`
	`760`	`+ if (!branchExists(branch)) {`
`760`	`761`	`qWarning() << "WARN: Transaction:" << branch << "is not a known branch in repository" << name << endl`
`761`	`762`	`<< "Going to create it automatically";`
`762`	`763`	`}`
`@@ -1153,8 +1154,9 @@ int FastImportRepository::Transaction::commit()`
`1153`	`1154`	`if (br.created && !br.marks.isEmpty() && br.marks.last()) {`
`1154`	`1155`	`parentmark = br.marks.last();`
`1155`	`1156`	`} else {`
`1156`		`- if (revnum > 1) {`
`1157`		`- // Any branch at revision 1 isn't going to exist, so lets not alarm the user.`
	`1157`	`+ if (revnum > 1 && branch != repository->defaultBranch) {`
	`1158`	`+ // Any branch at revision 1 isn't going to exist -> do not alarm the user.`
	`1159`	`+ // Default branch might also not exist yet -> do not alarm the user.`
`1158`	`1160`	`qWarning() << "WARN: Branch" << branch << "in repository" << repository->name << "doesn't exist at revision"`
`1159`	`1161`	`<< revnum << "-- did you resume from the wrong revision?";`
`1160`	`1162`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 381be06

File tree

1 file changed

1 file changed

`‎src/repository.cpp`

0 commit comments