Skip to content

Added --content-only flag for borg 1.2.4 in diff view#1670

Merged
m3nu merged 1 commit intoborgbase:masterfrom
jetchirag:fix-diff-unknown-changetype
Mar 30, 2023
Merged

Added --content-only flag for borg 1.2.4 in diff view#1670
m3nu merged 1 commit intoborgbase:masterfrom
jetchirag:fix-diff-unknown-changetype

Conversation

@jetchirag
Copy link
Copy Markdown
Contributor

Description

Borg 1.2.3 -> 1.2.4 introduced --content-only which crashes vorta on diff action when files have metadata changed. This PR adds --content-only flag to diff command for this borg version.

Related Issue

Fixes #1668

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • I have read the CONTRIBUTING guide.
  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

I provide my contribution under the terms of the license of this repository and I affirm the Developer Certificate of Origin.

Signed-off-by: Chirag Aggarwal <thechiragaggarwal@gmail.com>
@m3nu m3nu merged commit e0fe766 into borgbase:master Mar 30, 2023
@m3nu
Copy link
Copy Markdown
Contributor

m3nu commented Mar 30, 2023

I have confirmed the bug and proposed fix locally. Good job on this, @jetchirag 👏

@real-yfprojects
Copy link
Copy Markdown
Collaborator

If I am not mistaken the --content-only flag disables the mode change type too. However this is currently used in the diff view. Why don't we implement code for parsing ctime and mtime changes instead?

@m3nu
Copy link
Copy Markdown
Contributor

m3nu commented Mar 30, 2023

That would be even better. This PR is mostly as quick fix, so we can support Borg 1.2.4 with the next release. Wanna add an issue for that and mark it as "help needed" or something?

@real-yfprojects
Copy link
Copy Markdown
Collaborator

^ Done!

@jetchirag jetchirag deleted the fix-diff-unknown-changetype branch March 31, 2023 05:19
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.

diff causes critical error/crash

3 participants