octoleo/restic
2
2
Fork 0
mirror of https://github.com/octoleo/restic.git synced 2024-11-25 14:17:42 +00:00
Code Issues Releases Wiki Activity

Fix diff

Browse Source 
Nodes in trees were always printed with a `+` in diff, regardless of
whether or not a dir was added or removed. Let's use the mode we were
passed in printDir().

Closes #3685
This commit is contained in:
Alexander Neumann 2022-03-29 20:57:31 +02:00
parent a08b95c497
commit 206550a246
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
changelog/unreleased/issue-3685 Normal file
View File

@ -0,0 +1,7 @@
Bugfix: Fix the diff command
There was a bug in the `diff` command, it would always show files in a removed
directory as added. We've fixed that.
https://github.com/restic/restic/issues/3685
https://github.com/restic/restic/pull/3686

2
cmd/restic/cmd_diff.go
View File

@ -170,7 +170,7 @@ func (c *Comparer) printDir(ctx context.Context, mode string, stats *DiffStat, b
if node.Type == "dir" { if node.Type == "dir" {
name += "/" name += "/"
} }
c.printChange(NewChange(name, "+")) c.printChange(NewChange(name, mode))
stats.Add(node) stats.Add(node)
addBlobs(blobs, node) addBlobs(blobs, node)