Commit Diff

Commit:
4a1a737306fe863c1d6378370d345fae962a2cad
From:
Mark Jamsek <mark@jamsek.dev>
Date:
Message:
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@
Actions:
Patch | Tree
commit - c18e88e5d11bc9c1d5016a1eb8911858ad2077de
commit + 4a1a737306fe863c1d6378370d345fae962a2cad
blob - 2727b7a93c622ab7155f89a994420850e23c0d6d
blob + 34b8116a11c50dad2f634dc6fe4dcea09570a334
--- 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 - 8b3e1a4e57ad816297349a8e063b4b8e1c28f9cf
blob + 6b9d2e770dfea646062f38235278565cc893db6d
--- 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-