X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=dupemerge;a=blobdiff_plain;f=faster-dupemerge;h=44d0e91a929c361059b4e5a7df6f0ed6252d4699;hp=232c6bd3474958f8bd097187b23ec87457104a29;hb=85b26d64c5fe49e33e7946498d5dd6c756c415ce;hpb=2b50e38487d9cf116194606d5c407391ef2aa197 diff --git a/faster-dupemerge b/faster-dupemerge index 232c6bd..44d0e91 100755 --- a/faster-dupemerge +++ b/faster-dupemerge @@ -155,6 +155,7 @@ hard links). S, s - lstat(2) (see source for details) U - unlink(2) . - all inodes with similar attributes done + (123456) - current file size in bytes --sort pass next options (up to --) to sort command @@ -185,7 +186,7 @@ while ($#ARGV >= 0) { } elsif ($arg eq '--zeros') { $collapse_zero = 1; } elsif ($arg eq '--trust' || $arg eq '--skip-compare') { - $skip_compare_preference = 1; + $skip_compares = $skip_compare_preference = 1; } elsif ($arg =~ /^--skip-hash(?:=(\d+)([KkMmGgTt]?))?$/os) { my ($quantity, $unit) = ($1, $2); $unit ||= '_'; @@ -599,7 +600,7 @@ while () { print STDERR "weak_key=$weak_key inode=$inode name=$name\n" if $debug; - if ($size >= $skip_hashes_threshold) { + if ($skip_hashes_threshold && $size >= $skip_hashes_threshold) { $skip_hashes = 1; $skip_compares = 0; } else {