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

Bugfix/do not restore virtual files #5498

Merged
merged 4 commits into from
Mar 8, 2023
Merged

Conversation

mgallien
Copy link
Collaborator

@mgallien mgallien commented Mar 7, 2023

No description provided.

@codecov
Copy link

codecov bot commented Mar 7, 2023

Codecov Report

Merging #5498 (cbf7ba7) into master (68df7ca) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #5498   +/-   ##
=======================================
  Coverage   58.94%   58.94%           
=======================================
  Files         143      143           
  Lines       18312    18313    +1     
=======================================
+ Hits        10794    10795    +1     
  Misses       7518     7518           
Impacted Files Coverage Δ
src/libsync/propagateupload.cpp 76.36% <ø> (ø)
src/libsync/syncengine.cpp 80.93% <100.00%> (+0.02%) ⬆️

test/testsynccfapi.cpp Outdated Show resolved Hide resolved
test/testsynccfapi.cpp Outdated Show resolved Hide resolved
@mgallien mgallien force-pushed the bugfix/doNotRestoreVirtualFiles branch 2 times, most recently from 09dc566 to 777350f Compare March 7, 2023 10:10
@mgallien mgallien requested a review from allexzander March 7, 2023 10:12
mgallien added 4 commits March 8, 2023 09:45
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
add a test that will try to upload pure virtual files becase restoration
after server data fingerprint has changed

this is illegal and should not happen

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
would prevent trying to restore pure virtual files

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
@mgallien mgallien force-pushed the bugfix/doNotRestoreVirtualFiles branch from 777350f to cbf7ba7 Compare March 8, 2023 08:45
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-5498-cbf7ba78ad6482614a4e579fc5b129c2cf168109-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@sonarcloud
Copy link

sonarcloud bot commented Mar 8, 2023

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell B 1 Code Smell

100.0% 100.0% Coverage
0.0% 0.0% Duplication

@mgallien mgallien merged commit 20e20a6 into master Mar 8, 2023
@mgallien mgallien deleted the bugfix/doNotRestoreVirtualFiles branch March 8, 2023 09:42
@mgallien
Copy link
Collaborator Author

mgallien commented Mar 8, 2023

/backport to stable-3.7

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants