Skip to content

[release/1.0] archive/diff: fix consecutive directory removal bug#2127

Merged
stevvooe merged 2 commits intocontainerd:release/1.0from
dmcgowan:cherry-pick-2119
Feb 12, 2018
Merged

[release/1.0] archive/diff: fix consecutive directory removal bug#2127
stevvooe merged 2 commits intocontainerd:release/1.0from
dmcgowan:cherry-pick-2119

Conversation

@dmcgowan
Copy link
Copy Markdown
Member

Cherry pick of #2126

Since fs package was moved to continuity in master, this creates an identical fix for the fs package in the release/1.0 branch. There has been no functionality divergence since moving from master.

Fixes a bug where rmdir was not getting set on a directory if the
previous change was also a directory.

From f3fdbe586829c02f81fc55da62618b5a2b0edc51 in containerd/continuity

Signed-off-by: Derek McGowan <[email protected]>
@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #2127 into release/1.0 will not change coverage.
The diff coverage is 100%.

Impacted file tree graph

@@             Coverage Diff              @@
##           release/1.0    #2127   +/-   ##
============================================
  Coverage        50.56%   50.56%           
============================================
  Files               81       81           
  Lines             7169     7169           
============================================
  Hits              3625     3625           
  Misses            2849     2849           
  Partials           695      695
Flag Coverage Δ
#linux 50.56% <100%> (ø) ⬆️
Impacted Files Coverage Δ
fs/diff.go 46.47% <100%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 53aaa89...84dc165. Read the comment docs.

@crosbymichael
Copy link
Copy Markdown
Member

LGTM

1 similar comment
@stevvooe
Copy link
Copy Markdown
Member

LGTM

@stevvooe stevvooe merged commit b99bbe9 into containerd:release/1.0 Feb 12, 2018
@dmcgowan dmcgowan deleted the cherry-pick-2119 branch September 10, 2019 17:44
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