commit 28466fcabc0e493ee2ad79cf288842307653cd28
from: Mark Jamsek <mark@jamsek.dev>
via: Thomas Adam <thomas@xteddy.org>
date: Thu Jan 19 16:32:40 2023 UTC

fix diff and log diffstat tests broken in 65dedee0a2cd

I failed to update regress when changing the diffstat summary line in the
previous commit to use a singular noun after 1.

ok op@ and stsp@

commit - 4ef604a7de9fdfe2408e1a2aa20914493858122a
commit + 28466fcabc0e493ee2ad79cf288842307653cd28
blob - 31b2b6663de8cadb7bea2d2955b788b371c6edbf
blob + 1d8c8ef74b65a4293ca0d2c04c98c90170f334f1
--- regress/cmdline/diff.sh
+++ regress/cmdline/diff.sh
@@ -1498,7 +1498,7 @@ EOF
 diffstat $commit_id0 $commit_id1
  M  alpha  |  1+  1-
 
-1 file changed, 1 insertions(+), 1 deletions(-)
+1 file changed, 1 insertion(+), 1 deletion(-)
 
 EOF
 
@@ -1538,7 +1538,7 @@ diffstat $commit_id0 $commit_id1
  D  beta  |  0+  1-
  A  new   |  1+  0-
 
-2 files changed, 1 insertions(+), 1 deletions(-)
+2 files changed, 1 insertion(+), 1 deletion(-)
 
 EOF
 
@@ -1770,7 +1770,7 @@ EOF
 diffstat $alpha_blobid $alpha_new_blobid
  M  $short_alpha_id -> $short_alpha_new_id  |  1+  1-
 
-1 file changed, 1 insertions(+), 1 deletions(-)
+1 file changed, 1 insertion(+), 1 deletion(-)
 
 blob - $alpha_blobid
 blob + $alpha_new_blobid
blob - 0bd7331ffb2355312432cbbab9ac303f0991738d
blob + dbddd2322d9abced77aa8a4dbdaca9b153d81785
--- regress/cmdline/log.sh
+++ regress/cmdline/log.sh
@@ -876,14 +876,14 @@ test_log_diffstat() {
 	cat <<EOF >$testroot/stdout.expected
  A  new  |  1+  0-
 
-1 file changed, 1 insertions(+), 0 deletions(-)
+1 file changed, 1 insertion(+), 0 deletions(-)
  D  beta          |  0+  1-
  m  epsilon/zeta  |  0+  0-
 
-2 files changed, 0 insertions(+), 1 deletions(-)
+2 files changed, 0 insertions(+), 1 deletion(-)
  M  alpha  |  2+  1-
 
-1 file changed, 2 insertions(+), 1 deletions(-)
+1 file changed, 2 insertions(+), 1 deletion(-)
  A  alpha         |  1+  0-
  A  beta          |  1+  0-
  A  epsilon/zeta  |  1+  0-