Murmele/Gittyup
1
1
Fork 0
mirror of https://github.com/Murmele/Gittyup.git synced 2024-09-19 06:29:10 +03:00
Code Issues Projects Releases Wiki Activity

Fix build

Browse Source
This commit is contained in:
Martin Marmsoler 2023-02-16 19:17:41 +01:00
parent 33d8cdc157
commit 1efd6206c7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/rebase.cpp
View File

@ -628,8 +628,8 @@ void TestRebase::abortMR() {
int count) { int count) {
QVERIFY(rebase.isValid()); QVERIFY(rebase.isValid());
QCOMPARE(count, 1); QCOMPARE(count, 1);
QCOMPARE(before.message(), "File.txt changed by second QCOMPARE(before.message(), "File.txt changed by secondbranch\n");
branch\n"); rebaseAboutToRebase++; rebaseAboutToRebase++;
}); });
connect(mRepo.notifier(), &git::RepositoryNotifier::rebaseCommitInvalid, connect(mRepo.notifier(), &git::RepositoryNotifier::rebaseCommitInvalid,
[]() { QVERIFY(false); }); // Should not be called []() { QVERIFY(false); }); // Should not be called