Re: [PATCH v2 03/11] t0000: update tests for SHA-256

2018-08-19 Thread brian m. carlson
On Sun, Aug 19, 2018 at 04:01:05PM -0400, Eric Sunshine wrote:
> On Sun, Aug 19, 2018 at 1:54 PM brian m. carlson
> > diff --git a/t/t-basic.sh b/t/t-basic.sh
> > @@ -868,8 +870,9 @@ test_expect_success 'writing tree out with git 
> > write-tree' '
> > +test_expect_success 'validate object ID of a known tree' '
> > +echo $tree &&
> 
> Debugging gunk?

Yup.  Will fix both.

> > +   test "$tree" = $(test_oid simpletree)
> 
> If test_oid() fails to find key "simpletree", this expression will be
> invalid. Therefore, it probably would be a good idea to quote the
> $(test_oid ...) invocation.

Good idea.
-- 
brian m. carlson: Houston, Texas, US
OpenPGP: https://keybase.io/bk2204


signature.asc
Description: PGP signature


Re: [PATCH v2 03/11] t0000: update tests for SHA-256

2018-08-19 Thread Eric Sunshine
On Sun, Aug 19, 2018 at 1:54 PM brian m. carlson
 wrote:
> Test t tests the "basics of the basics" and as such, checks that we
> have various fixed hard-coded object IDs.  The tests relying on these
> assertions have been marked with the SHA1 prerequisite, as they will
> obviously not function in their current form with SHA-256.
>
> Use the test_oid helper to update these assertions and provide values
> for both SHA-1 and SHA-256.
> [...]
> Signed-off-by: brian m. carlson 
> ---
> diff --git a/t/t-basic.sh b/t/t-basic.sh
> @@ -868,8 +870,9 @@ test_expect_success 'writing tree out with git 
> write-tree' '
> +test_expect_success 'validate object ID of a known tree' '
> +echo $tree &&

Debugging gunk?

> +   test "$tree" = $(test_oid simpletree)

If test_oid() fails to find key "simpletree", this expression will be
invalid. Therefore, it probably would be a good idea to quote the
$(test_oid ...) invocation.

> @@ -911,17 +914,18 @@ test_expect_success 'showing stage with git ls-files 
> --stage' '
> +test_expect_success 'validate git ls-files output for a known tree' '
> +   cat >expected <<-EOF &&
> +   100644 $(test_oid path0f) 0 path0
> +   12 $(test_oid path0s) 0 path0sym
> +   100644 $(test_oid path2f) 0 path2/file2
> +   12 $(test_oid path2s) 0 path2/file2sym
> +   100644 $(test_oid path3f) 0 path3/file3
> +   12 $(test_oid path3s) 0 path3/file3sym
> +   100644 $(test_oid subp3f) 0 path3/subp3/file3
> +   12 $(test_oid subp3s) 0 path3/subp3/file3sym
> EOF
> +   cat expected &&

Debugging gunk?

> test_cmp expected current
>  '