mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-28 19:21:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

diff kitten: Add support for files that are identical apart from mode changes

Browse Source 
Fixes #6611
This commit is contained in:
Kovid Goyal
2023-09-09 19:04:54 +05:30
parent eb51d459ae
commit c99d55691d
3 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
kittens/diff/collect.go
View File

@@ -312,6 +312,16 @@ func (self *Collection) collect_files(left, right string) error {
if ld != rd {
changed_names.Add(n)
self.add_change(left_path_map[n], right_path_map[n])
} else {
if lstat, err := os.Stat(left_path_map[n]); err == nil {
if rstat, err := os.Stat(right_path_map[n]); err == nil {
if lstat.Mode() != rstat.Mode() {
// identical files with only a mode change
changed_names.Add(n)
self.add_change(left_path_map[n], right_path_map[n])
}
}
}
}
}
removed := left_names.Subtract(common_names)