summaryrefslogtreecommitdiff
path: root/git-cvsserver.perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-11-04 14:58:05 -0800
committerJunio C Hamano <gitster@pobox.com>2013-11-04 14:58:05 -0800
commitec787db662af05eb6b7dcd71bed1548055cf437a (patch)
treeb609d9c37f372c0457efb5e9c24b754e8e0edf13 /git-cvsserver.perl
parenta3a9cff0371f5dd3dd199ef227911cd812e1708d (diff)
parent9462953ad25f9ad6ef933908c317dcbbfd4397ed (diff)
downloadgit-ec787db662af05eb6b7dcd71bed1548055cf437a.tar.gz
Merge branch 'ak/cvsserver-stabilize-use-of-hash-keys'
* ak/cvsserver-stabilize-use-of-hash-keys: cvsserver: Determinize output to combat Perl 5.18 hash randomization
Diffstat (limited to 'git-cvsserver.perl')
-rwxr-xr-xgit-cvsserver.perl10
1 files changed, 5 insertions, 5 deletions
diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index 74d1cc7db0..95e69b19a7 100755
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -430,10 +430,10 @@ sub req_validrequests
$log->debug("req_validrequests");
- $log->debug("SEND : Valid-requests " . join(" ",keys %$methods));
+ $log->debug("SEND : Valid-requests " . join(" ",sort keys %$methods));
$log->debug("SEND : ok");
- print "Valid-requests " . join(" ",keys %$methods) . "\n";
+ print "Valid-requests " . join(" ",sort keys %$methods) . "\n";
print "ok\n";
}
@@ -2124,7 +2124,7 @@ sub req_diff
print "M retrieving revision $meta2->{revision}\n"
}
print "M diff ";
- foreach my $opt ( keys %{$state->{opt}} )
+ foreach my $opt ( sort keys %{$state->{opt}} )
{
if ( ref $state->{opt}{$opt} eq "ARRAY" )
{
@@ -4050,7 +4050,7 @@ sub update
close FILELIST;
# Detect deleted files
- foreach my $file ( keys %$head )
+ foreach my $file ( sort keys %$head )
{
unless ( exists $seen_files->{$file} or $head->{$file}{filehash} eq "deleted" )
{
@@ -4078,7 +4078,7 @@ sub update
}
$self->delete_head();
- foreach my $file ( keys %$head )
+ foreach my $file ( sort keys %$head )
{
$self->insert_head(
$file,