branch: master
commit 8650a5254374ddcd29f75ca3beb67cb8b36ad55c
Merge: 78e24b7 6826c3f
Author: Alexey Veretennikov <alexey.veretenni...@gmail.com>
Commit: Alexey Veretennikov <alexey.veretenni...@gmail.com>
Issue #18: files considered different if they have different sizes
Merge commit '6826c3f3f3735fbf060206072392d67f0990f817'
---
packages/ztree/ztree-diff-model.el | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/packages/ztree/ztree-diff-model.el
b/packages/ztree/ztree-diff-model.el
index 20df0c0..617f8b8 100644
--- a/packages/ztree/ztree-diff-model.el
+++ b/packages/ztree/ztree-diff-model.el
@@ -143,11 +143,18 @@ RIGHT if only on the right side."
Returns t if equal."
(unless (ztree-same-host-p file1 file2)
(error "Compared files are not on the same host"))
- (let* ((file1-untrampified (ztree-quotify-string (ztree-untrampify-filename
file1)))
- (file2-untrampified (ztree-quotify-string (ztree-untrampify-filename
file2)))
- (diff-command (concat diff-command " -q" " " file1-untrampified " "
file2-untrampified))
- (diff-output (shell-command-to-string diff-command)))
- (if (<= (length diff-output) 2) 'same 'diff)))
+ (let* ((file1-untrampified (ztree-untrampify-filename file1))
+ (file2-untrampified (ztree-untrampify-filename file2))
+ (diff-cmd (concat diff-command " -q" " "
+ (ztree-quotify-string file1-untrampified)
+ " "
+ (ztree-quotify-string file2-untrampified))))
+ (if (and
+ (= (nth 7 (file-attributes file1-untrampified))
+ (nth 7 (file-attributes file2-untrampified)))
+ (> (length (shell-command-to-string diff-cmd)) 2))
+ 'diff
+ 'same)))
(defun ztree-directory-files (dir)
"Return the list of full paths of files in a directory DIR.
