Re: [PATCH 35/38] t: make SHA1 prerequisite depend on default hash
- From
Denton Liu <liu.denton@gmail.com>
- Date
- Jul 12, 2020, 02:13 UTC
- Message-ID
- <20200712021350.GA34873@generichostname>
- In-Reply-To
- <20200710024728.3100527-36-sandals@crustytoothpaste.net>
Hi Brian,
On Fri, Jul 10, 2020 at 02:47:25AM +0000, brian m. carlson wrote:
Show 11 quoted lines
> diff --git a/t/test-lib.sh b/t/test-lib.sh > index 307bb2207e..30ab0428fb 100644 > --- a/t/test-lib.sh > +++ b/t/test-lib.sh > @@ -1689,7 +1689,8 @@ test_lazy_prereq CURL ' > # which will not work with other hash algorithms and tests that work but don't > # test anything meaningful (e.g. special values which cause short collisions). > test_lazy_prereq SHA1 ' > - test $(git hash-object /dev/null) = e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 > + test $(git hash-object /dev/null) = e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 && > + ([ -z "$GIT_DEFAULT_HASH" ] || [ "$GIT_DEFAULT_HASH" = "sha1" ])
Tiny nitpick that I noticed in passing, is there any reason why we need a subshell here? If not, I would just switch this to a command group via {}.
-Denton
> ' > > test_lazy_prereq REBASE_P '