| Message ID | 20200513005424.81369-25-sandals@crustytoothpaste.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | SHA-256 part 2/3: protocol functionality | expand |
On Wed, 13 May 2020 at 02:56, brian m. carlson <sandals@crustytoothpaste.net> wrote: > > One of the test assertions in this test checks that git branch -m works > even without a .git/config file. However, if the repository requires > configuration extensions, such as because it uses a non-SHA-1 algorithm, > this assertion will fail. Mark the assertion as requiring SHA-1. Makes sense. > -test_expect_success 'git branch -m q q2 without config should succeed' ' > +test_expect_success SHA1 'git branch -m q q2 without config should succeed' ' > git branch -m q q2 && > git branch -m q2 q > ' Going forward, we might need config files for other reasons (reftable?), meaning this would become "SHA1,!REFTABLE". So maybe this should be "!CONFIG_EXTENSIONS" or "CONFIG_LESS". I think this is ok for now, though. When/if someone needs to make another fix like this here -- or at the very least the *third* time around -- that's when we should think a bit bigger. Martin
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 411a70b0ce..2a3fedc6b0 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -402,7 +402,7 @@ EOF mv .git/config .git/config-saved -test_expect_success 'git branch -m q q2 without config should succeed' ' +test_expect_success SHA1 'git branch -m q q2 without config should succeed' ' git branch -m q q2 && git branch -m q2 q '
One of the test assertions in this test checks that git branch -m works even without a .git/config file. However, if the repository requires configuration extensions, such as because it uses a non-SHA-1 algorithm, this assertion will fail. Mark the assertion as requiring SHA-1. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> --- t/t3200-branch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)