projects
/
dupemerge
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2b50e38
)
Make the *absence* of --skip-hash work again
author
Zygo Blaxell
<zblaxell@waya.furryterror.org>
Sat, 9 Jan 2010 17:24:32 +0000
(12:24 -0500)
committer
Zygo Blaxell
<zblaxell@waya.furryterror.org>
Sat, 9 Jan 2010 17:24:32 +0000
(12:24 -0500)
faster-dupemerge
patch
|
blob
|
history
diff --git
a/faster-dupemerge
b/faster-dupemerge
index 232c6bd3474958f8bd097187b23ec87457104a29..9753e5aacb2a74ffb9b89fa0a4eec5636d600c90 100755
(executable)
--- a/
faster-dupemerge
+++ b/
faster-dupemerge
@@
-185,7
+185,7
@@
while ($#ARGV >= 0) {
} elsif ($arg eq '--zeros') {
$collapse_zero = 1;
} elsif ($arg eq '--trust' || $arg eq '--skip-compare') {
} elsif ($arg eq '--zeros') {
$collapse_zero = 1;
} elsif ($arg eq '--trust' || $arg eq '--skip-compare') {
- $skip_compare_preference = 1;
+ $skip_compare
s = $skip_compare
_preference = 1;
} elsif ($arg =~ /^--skip-hash(?:=(\d+)([KkMmGgTt]?))?$/os) {
my ($quantity, $unit) = ($1, $2);
$unit ||= '_';
} elsif ($arg =~ /^--skip-hash(?:=(\d+)([KkMmGgTt]?))?$/os) {
my ($quantity, $unit) = ($1, $2);
$unit ||= '_';
@@
-599,7
+599,7
@@
while (<FIND>) {
print STDERR "weak_key=$weak_key inode=$inode name=$name\n" if $debug;
print STDERR "weak_key=$weak_key inode=$inode name=$name\n" if $debug;
- if ($size >= $skip_hashes_threshold) {
+ if ($s
kip_hashes_threshold && $s
ize >= $skip_hashes_threshold) {
$skip_hashes = 1;
$skip_compares = 0;
} else {
$skip_hashes = 1;
$skip_compares = 0;
} else {