Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prevent Uncommitted Changes from being shown when ShowCleanStatus is false #714

Merged
merged 2 commits into from May 22, 2024
Merged

Prevent Uncommitted Changes from being shown when ShowCleanStatus is false #714

merged 2 commits into from May 22, 2024

Conversation

jensenr30
Copy link
Contributor

Previously, it was possible for the Uncommitted Changes row to be appended to the CommitList even if the "Show Clean Status" option had been unchecked. This commit prevents that from happening.

This closes #711.

@jensenr30 jensenr30 mentioned this pull request Mar 16, 2024
Open
@Murmele
Copy link
Owner

Murmele commented Mar 28, 2024

@jensenr30 can you rebase?

@Murmele
Copy link
Owner

Murmele commented Apr 20, 2024

Can you fix the tests?

@jensenr30
Copy link
Contributor Author

Can you fix the tests?

I will look into why this test is failing and try to fix it.

@jensenr30
Copy link
Contributor Author

@Murmele
I fixed the test I broke. Now there is a linking error for macos - is that something wrong with my code? Or does that linker error happen on master as well?

@Murmele
Copy link
Owner

Murmele commented May 3, 2024 •
edited

On master this problem does not happen.

ld: Undefined symbols:
  QArrayData::deallocate(QArrayData*, unsigned long, unsigned long), referenced from:
      _main in relauncher.cpp.o
      _main in relauncher.cpp.o
      QStringList::~QStringList() in relauncher.cpp.o
      QList<QString>::detach_helper(int) in relauncher.cpp.o
  QCoreApplication::arguments(), referenced from:
      _main in relauncher.cpp.o
  QCoreApplication::QCoreApplication(int&, char**, int), referenced from:
      _main in relauncher.cpp.o
  QCoreApplication::~QCoreApplication(), referenced from:
      _main in relauncher.cpp.o
      _main in relauncher.cpp.o
  QThread::msleep(unsigned long), referenced from:
      _main in relauncher.cpp.o
  QProcess::startDetached(QString const&), referenced from:
      _main in relauncher.cpp.o
  QListData::erase(void**), referenced from:
      _main in relauncher.cpp.o
  QListData::detach(int), referenced from:
      QList<QString>::detach_helper(int) in relauncher.cpp.o
  QListData::dispose(QListData::Data*), referenced from:
      _main in relauncher.cpp.o
      QStringList::~QStringList() in relauncher.cpp.o
      QList<QString>::detach_helper(int) in relauncher.cpp.o
  QString::toInt(bool*, int) const, referenced from:
      _main in relauncher.cpp.o
clang: error: linker command failed with exit code 1 (use -v to see invocation)

Can you try to rebase?

@Murmele
Copy link
Owner

Murmele commented May 21, 2024

Sorry you have to rebase once again, I fixed the macos error in the latest release

@jensenr30
Prevent Uncommitted Changes from being shown when ShowCleanStatus is …
e6e6aaf 
…false

Previously, it was possible for the "Uncommitted Changes" row to be
appended to the CommitList even if "Show Clean Status" option had been
unchecked.  This commit prevents that from happening.
@jensenr30
fix init_repo test
1bc89cd 
TestInitRepo::addFile() was timing out because my clean status changes
prevented the 'uncommitted changes' "commit" from being displayed in
CommitList.  This has been fixed by showing clean status by default.
@jensenr30
Copy link
Contributor Author

I don't mind rebasing. Thanks for fixing the builds :)

@Murmele
Copy link
Owner

Murmele commented May 22, 2024

Thank you for the contribution!

@Murmele Murmele merged commit 04991eb into Murmele:master May 22, 2024
11 checks passed
@jensenr30 jensenr30 deleted the fix-show-clean-status branch May 22, 2024 08:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Uncommitted Changes doesn't disappear when it should
2 participants
@jensenr30 @Murmele