]> Sergey Matveev's repositories - public-inbox.git/commitdiff
t/solver_git: fix test to work with git <2.29
authorEric Wong <e@80x24.org>
Wed, 29 Sep 2021 03:02:54 +0000 (03:02 +0000)
committerEric Wong <e@80x24.org>
Wed, 29 Sep 2021 03:09:39 +0000 (03:09 +0000)
'git diff --abbrev=40' did not abbreviate /^index / lines of
diff output with git <2.29, and 40 will be insufficient for
SHA-256.  --full-index has been around since 2005, so it's safe
to rely on.

Tested git version 2.20.0 (Debian buster).

Fixes: 751df49e7db8ba77 ("lei rediff: add --drq and --dequote-only")
t/solver_git.t

index cf450e2459e54f1529550eea4c088ecee3ebfae6..1baa012b1abeb56a77c98519e8a27b08697aafe9 100644 (file)
@@ -89,7 +89,7 @@ Subject: Re: awesome advice
 
 WEB DESIGN EXPERT wrote:
 EOM
-       lei_ok([qw(rediff --abbrev=40 -U16 --drq)], undef,
+       lei_ok([qw(rediff --full-index -U16 --drq)], undef,
                { 0 => \$re, %$lei_opt });
        my $exp = <<'EOM';
 From: me@example.com
@@ -116,7 +116,7 @@ EOM
        $exp =~ s/^>$/> /sgm; # re-add trailing white space
        like($lei_out, qr/\Q$exp\E/, '--drq diffstat + context');
 
-       lei_ok(qw(rediff -q --abbrev=40 -U9 t/solve/bare.patch));
+       lei_ok(qw(rediff -q --full-index -U9 t/solve/bare.patch));
        $exp = <<'EOM';
 diff --git a/script/public-inbox-extindex b/script/public-inbox-extindex
 old mode 100644