зеркало из https://github.com/microsoft/docker.git
fix Path corruption in 'docker diff'
This commit is contained in:
Родитель
e42eb7fa8c
Коммит
e16c93486d
|
@ -65,7 +65,7 @@ func Changes(layers []string, rw string) ([]Change, error) {
|
||||||
file := filepath.Base(path)
|
file := filepath.Base(path)
|
||||||
// If there is a whiteout, then the file was removed
|
// If there is a whiteout, then the file was removed
|
||||||
if strings.HasPrefix(file, ".wh.") {
|
if strings.HasPrefix(file, ".wh.") {
|
||||||
originalFile := strings.TrimLeft(file, ".wh.")
|
originalFile := strings.TrimPrefix(file, ".wh.")
|
||||||
change.Path = filepath.Join(filepath.Dir(path), originalFile)
|
change.Path = filepath.Join(filepath.Dir(path), originalFile)
|
||||||
change.Kind = ChangeDelete
|
change.Kind = ChangeDelete
|
||||||
} else {
|
} else {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче