user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
* [PATCH] t/solver_git: fix test to work with git <2.29
@ 2021-09-29  3:02 Eric Wong
  0 siblings, 0 replies; only message in thread
From: Eric Wong @ 2021-09-29  3:02 UTC (permalink / raw)
  To: meta

'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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/t/solver_git.t b/t/solver_git.t
index cf450e24..1baa012b 100644
--- a/t/solver_git.t
+++ b/t/solver_git.t
@@ -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

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2021-09-29  3:02 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-29  3:02 [PATCH] t/solver_git: fix test to work with git <2.29 Eric Wong

Code repositories for project(s) associated with this inbox:

	https://80x24.org/public-inbox.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).