From: Mark Jamsek <mark@jamsek.com>
Subject: Re: got-build-regress.sh regress failure
To: stsp@stsp.name
Cc: gameoftrees@openbsd.org
Date: Mon, 16 Jan 2023 14:53:09 +1100

On 23-01-16 09:50AM, Mark Jamsek wrote:
> Sorry, Stefan, that’s my fault; I forgot to update regress when
> I changed the summary line last night. I’ll fix this soon as I’m home!
> (sorry for top posting too)
> 
> > ==== log ====
> > ./log.sh -q -r "/tmp"
> > --- /tmp/got-test-log_diffstat-QrcEy9Eb/stdout.expected    Sun Jan 15 20:02:55 2023
> > +++ /tmp/got-test-log_diffstat-QrcEy9Eb/stdout    Sun Jan 15 20:02:55 2023
> > @@ -1,13 +1,13 @@
> >  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-
> > test failed; leaving test data in /tmp/got-test-log_diffstat-QrcEy9Eb
> > 
> > ==== add ====
> > ./add.sh -q -r "/tmp"
> > 
> > ==== rm ====
> > ./rm.sh -q -r "/tmp"
> > 
> > ==== diff ====
> > ./diff.sh -q -r "/tmp"
> > --- /tmp/got-test-diff_commit_diffstat-7f6lZF1F/stdout.expected    Sun Jan 15 20:03:20 2023
> > +++ /tmp/got-test-diff_commit_diffstat-7f6lZF1F/stdout    Sun Jan 15 20:03:20 2023
> > @@ -1,7 +1,7 @@
> > diffstat 33277b4556196291537d228f596d89dc2e45d5dd a70ba3853a795e7d99fbc1642393e3de31896ac5
> >  M  alpha  |  1+  1-
> > 
> > -1 file changed, 1 insertions(+), 1 deletions(-)
> > +1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff 33277b4556196291537d228f596d89dc2e45d5dd a70ba3853a795e7d99fbc1642393e3de31896ac5
> > commit - 33277b4556196291537d228f596d89dc2e45d5dd
> > test failed; leaving test data in /tmp/got-test-diff_commit_diffstat-7f6lZF1F
> > --- /tmp/got-test-diff_worktree_diffstat-kOmUvtwx/stdout.expected    Sun Jan 15 20:03:21 2023
> > +++ /tmp/got-test-diff_worktree_diffstat-kOmUvtwx/stdout    Sun Jan 15 20:03:21 2023
> > @@ -1,7 +1,7 @@
> > diffstat 4a58007052a65fbc2fc3f910f2855f45a4058e74 b5ceb0306811eb823d1ecd6a6913fd0906062bba
> >  M  4a58007052 -> b5ceb03068  |  1+  1-
> > 
> > -1 file changed, 1 insertions(+), 1 deletions(-)
> > +1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > blob - 4a58007052a65fbc2fc3f910f2855f45a4058e74
> > blob + b5ceb0306811eb823d1ecd6a6913fd0906062bba
> > test failed; leaving test data in /tmp/got-test-diff_worktree_diffstat-kOmUvtwx
> > 
> >     Test failures:
> > 
> > test failed; leaving test data in /tmp/got-test-log_diffstat-QrcEy9Eb
> > test failed; leaving test data in /tmp/got-test-diff_commit_diffstat-7f6lZF1F
> > test failed; leaving test data in /tmp/got-test-diff_worktree_diffstat-kOmUvtwx
> > 
> 

Updated diff and log regress tests are below. Sorry again for failing
to do this when making the change and thanks for alerting me!

I also want to make sure you're ok with the decision not to elide the
0 insertion/deletion case (like git does)?

diffstat c18e88e5d11bc9c1d5016a1eb8911858ad2077de refs/heads/main
 M  regress/cmdline/diff.sh  |  3+  3-
 M  regress/cmdline/log.sh   |  3+  3-

2 files changed, 6 insertions(+), 6 deletions(-)

diff c18e88e5d11bc9c1d5016a1eb8911858ad2077de refs/heads/main
commit - c18e88e5d11bc9c1d5016a1eb8911858ad2077de
commit + f22ce391419064114f570532ab72a0d211df2d2a
blob - 2727b7a93c622ab7155f89a994420850e23c0d6d
blob + 34b8116a11c50dad2f634dc6fe4dcea09570a334
--- regress/cmdline/diff.sh
+++ regress/cmdline/diff.sh
@@ -1498,7 +1498,7 @@ diffstat $commit_id0 $commit_id1
 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 @@ diffstat $alpha_blobid $alpha_new_blobid
 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-

-- 
Mark Jamsek <fnc.bsdbox.org>
GPG: F2FF 13DE 6A06 C471 CA80  E6E2 2930 DC66 86EE CF68