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

Suppress modified changes for files which weren't actually modified in JSON output. #8460

Merged

Conversation

ThomasWaldmann
Copy link
Member

@ThomasWaldmann ThomasWaldmann commented Oct 5, 2024

Port of #8334.

@ThomasWaldmann ThomasWaldmann changed the title Json no changes master Suppress modified changes for files which weren't actually modified in JSON output. Oct 5, 2024
@ThomasWaldmann
Copy link
Member Author

@cr1901 Due to changes in master, these changesets didn't apply well and I had to make some changes, please review.

Copy link

codecov bot commented Oct 5, 2024

Codecov Report

Attention: Patch coverage is 93.33333% with 1 line in your changes missing coverage. Please review.

Project coverage is 81.69%. Comparing base (090ee52) to head (1e4314f).
Report is 17 commits behind head on master.

Files with missing lines Patch % Lines
src/borg/archiver/diff_cmd.py 93.33% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #8460      +/-   ##
==========================================
+ Coverage   81.68%   81.69%   +0.01%     
==========================================
  Files          72       72              
  Lines       12950    12961      +11     
  Branches     2345     2347       +2     
==========================================
+ Hits        10578    10589      +11     
  Misses       1708     1708              
  Partials      664      664              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@cr1901
Copy link
Contributor

cr1901 commented Oct 5, 2024

these changesets didn't apply well and I had to make some changes

That's fine, because it looks like all but one of the test code changes applied correctly. I marked the single difference in a comment asking for clarification.

All the non-test code looks fine too. Since CI is green for (almost) identical tests, this LGTM pending clarification.

ctime is file creation time on windows and is not updated on "touch".
@ThomasWaldmann ThomasWaldmann merged commit d7d59b5 into borgbackup:master Oct 6, 2024
16 checks passed
@ThomasWaldmann ThomasWaldmann deleted the json-no-changes-master branch October 6, 2024 11:48
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.

2 participants