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.

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

Prevent unnecessary merge requests on intermittent network shares #4153

merged 1 commit into from Jan 11, 2020


Copy link

droidmonkey commented Jan 11, 2020

Type of change

  • Bug fix (non-breaking change which fixes an issue)

Description and Context

Testing strategy

Tested by disabling the file watcher and renaming the database file so it cannot be opened by the hashing routine. Upon renaming back to normal no merge request was provided.


  • I have read the CONTRIBUTING document. [REQUIRED]
  • My code follows the code style of this project. [REQUIRED]
  • All new and existing tests passed. [REQUIRED]
  • I have compiled and verified my code with -DWITH_ASAN=ON. [REQUIRED]
  • My change requires a change to the documentation, and I have updated it accordingly.
  • I have added tests to cover my changes.
@droidmonkey droidmonkey added the bug label Jan 11, 2020
@droidmonkey droidmonkey added this to the v2.5.3 milestone Jan 11, 2020
@droidmonkey droidmonkey requested a review from phoerious Jan 11, 2020
@droidmonkey droidmonkey merged commit cba8947 into release/2.5.3 Jan 11, 2020
4 checks passed
4 checks passed
Code Format (KeepassXC) TeamCity build finished
MacOS (KeepassXC) TeamCity build finished
Ubuntu Linux (KeepassXC) TeamCity build finished
Windows 10 (KeepassXC) TeamCity build finished
@droidmonkey droidmonkey deleted the hotfix/merge-request branch Jan 11, 2020
phoerious added a commit that referenced this pull request Jan 19, 2020

- Fix a possible database lockout when removing a YubiKey from a KDBX 3.1 database [#4147]
- Fix crash if Auto-Type is performed on a new entry [#4150]
- Fix crash when all entries are deleted from a group [#4156]
- Improve the reliability of clipboard clearing on Gnome [#4165]
- Do not check cmd:// URLs for valid URL syntax anymore [#4172]
- Prevent unnecessary merges for databases on network shares [#4153]
- Browser: Prevent native messaging proxy from blocking application shutdown [#4155]
- Browser: Improve website URL matching [#4134, #4177]


- Browser: Enable support for Chromium-based Edge Browser [#3359]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.