From: Junio C Hamano <gitster@pobox.com>
To: Anders Kaseorg <andersk@MIT.EDU>
Cc: git@vger.kernel.org, 727226@bugs.debian.org
Subject: Re: [PATCH] cvsserver: Determinize output to combat Perl 5.18 hash randomization
Date: Wed, 30 Oct 2013 10:30:46 -0700 [thread overview]
Message-ID: <xmqqeh72d5tk.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <alpine.DEB.2.00.1310300413430.20647@dr-wily.mit.edu> (Anders Kaseorg's message of "Wed, 30 Oct 2013 04:44:43 -0400 (EDT)")
Anders Kaseorg <andersk@MIT.EDU> writes:
> Perl 5.18 randomizes the seed used by its hash function, so iterating
> through hashes results in different orders from run to run:
> http://perldoc.perl.org/perl5180delta.html#Hash-overhaul
>
> This usually broke t9400 (gitcvs.dbname, gitcvs.ext.dbname, when
> running cmp on two .sqlite files) and t9402 (check [cvswork3] diff,
> when running test_cmp on two diffs).
>
> To fix this, hide the internal order of hashes with sort when sending
> output or running database queries.
>
> (An alternative workaround is PERL_HASH_SEED=0, but this seems nicer.)
>
> Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Thanks, will queue.
> ---
> git-cvsserver.perl | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/git-cvsserver.perl b/git-cvsserver.perl
> index 67b1e7b..6177f4a 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,
prev parent reply other threads:[~2013-10-30 17:30 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-30 8:44 [PATCH] cvsserver: Determinize output to combat Perl 5.18 hash randomization Anders Kaseorg
2013-10-30 17:30 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqeh72d5tk.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=727226@bugs.debian.org \
--cc=andersk@MIT.EDU \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).