Merge branch 'maint'

diff --git a/git-relink.perl b/git-relink.perl
index f6b4f6a2f81767fdcb2ccadbf7757eaa2b556c36..15fb932021e03e2b7b856b3a2285021be2ebac61 100755 (executable)
--- a/git-relink.perl
+++ b/git-relink.perl
@@ -40,7 +40,7 @@
 opendir(D,$master_dir . "objects/")
        or die "Failed to open $master_dir/objects/ : $!";
 
-my @hashdirs = grep !/^\.{1,2}$/, readdir(D);
+my @hashdirs = grep { ($_ eq 'pack') || /^[0-9a-f]{2}$/ } readdir(D);
 
 foreach my $repo (@dirs) {
        $linked = 0;