mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-12 00:06:36 +02:00
Code

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
This commit is contained in:
Junio C Hamano 2013-11-04 14:58:05 -08:00
parent a3a9cff037 9462953ad2
commit ec787db662
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
git-cvsserver.perl
View File

@ -430,10 +430,10 @@ sub req_validrequests
$log->debug("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"); $log->debug("SEND : ok");
print "Valid-requests " . join(" ",keys %$methods) . "\n"; print "Valid-requests " . join(" ",sort keys %$methods) . "\n";
print "ok\n"; print "ok\n";
} }
@ -2124,7 +2124,7 @@ sub req_diff
print "M retrieving revision $meta2->{revision}\n" print "M retrieving revision $meta2->{revision}\n"
} }
print "M diff "; print "M diff ";
foreach my $opt ( keys %{$state->{opt}} ) foreach my $opt ( sort keys %{$state->{opt}} )
{ {
if ( ref $state->{opt}{$opt} eq "ARRAY" ) if ( ref $state->{opt}{$opt} eq "ARRAY" )
{ {
@ -4050,7 +4050,7 @@ sub update
close FILELIST; close FILELIST;
# Detect deleted files # 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" ) unless ( exists $seen_files->{$file} or $head->{$file}{filehash} eq "deleted" )
{ {
@ -4078,7 +4078,7 @@ sub update
} }
$self->delete_head(); $self->delete_head();
foreach my $file ( keys %$head ) foreach my $file ( sort keys %$head )
{ {
$self->insert_head( $self->insert_head(
$file, $file,