Skip to content

[release/1.0] archive: fix duplicate directories entries on metadata change#2063

Merged
stevvooe merged 1 commit intocontainerd:release/1.0from
dmcgowan:cherry-pick-2054
Jan 25, 2018
Merged

[release/1.0] archive: fix duplicate directories entries on metadata change#2063
stevvooe merged 1 commit intocontainerd:release/1.0from
dmcgowan:cherry-pick-2054

Conversation

@dmcgowan
Copy link
Copy Markdown
Member

cherry-pick of #2054

Fixes a regression to diff behavior in 1.0.1 affecting builders

Currently directory changes are not added to the list of
included directories, allowing those directories to receive
duplicate entries where there is both a metadata change to the
directory and a change to a file under that directory.

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

Codecov Report

Merging #2063 into release/1.0 will increase coverage by 0.01%.
The diff coverage is 100%.

Impacted file tree graph

@@               Coverage Diff               @@
##           release/1.0    #2063      +/-   ##
===============================================
+ Coverage        50.57%   50.59%   +0.01%     
===============================================
  Files               81       81              
  Lines             7163     7165       +2     
===============================================
+ Hits              3623     3625       +2     
  Misses            2847     2847              
  Partials           693      693
Flag Coverage Δ
#linux 50.59% <100%> (+0.01%) ⬆️
Impacted Files Coverage Δ
archive/tar.go 50.76% <100%> (+0.3%) ⬆️

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 c10ef55...5c21576. Read the comment docs.

@crosbymichael
Copy link
Copy Markdown
Member

LGTM

@stevvooe stevvooe added this to the 1.0.2 milestone Jan 25, 2018
@stevvooe
Copy link
Copy Markdown
Member

LGTM

@stevvooe stevvooe merged commit 3e89d82 into containerd:release/1.0 Jan 25, 2018
@dmcgowan dmcgowan deleted the cherry-pick-2054 branch September 10, 2019 17:46
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