Skip to content

Commit 4f8576a

Browse files
Ben PeartBen Peart
authored andcommitted
PR 136352: Add tests to ensure ident replacement tokens are blocked under GVFS
- Add tests to ensure ident replacement tokens are blocked under GVFS
1 parent 3269be3 commit 4f8576a

File tree

1 file changed

+30
-1
lines changed

1 file changed

+30
-1
lines changed

t/t0021-conversion.sh

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,15 +256,44 @@ test_expect_success "filter: clean filters blocked when under GVFS" '
256256
git config core.gvfs 64 &&
257257
258258
echo dead data walking >empty-in-repo &&
259-
test_must_fail git add empty-in-repo
259+
test_must_fail git add empty-in-repo &&
260+
261+
git config --unset core.gvfs
260262
'
261263

262264
test_expect_success "filter: smudge filters blocked when under GVFS" '
265+
git config core.gvfs 64 &&
266+
263267
test_must_fail git checkout &&
264268
265269
git config --unset core.gvfs
266270
'
267271

272+
test_expect_success "ident blocked on add when under GVFS" '
273+
git config core.gvfs 64 &&
274+
git config core.autocrlf false &&
275+
276+
echo "*.i ident" >.gitattributes &&
277+
echo "\$Id\$" > ident.i &&
278+
279+
test_must_fail git add ident.i &&
280+
281+
git config --unset core.gvfs
282+
'
283+
284+
test_expect_success "ident blocked when under GVFS" '
285+
git add ident.i &&
286+
287+
git commit -m "added ident.i" &&
288+
git config core.gvfs 64 &&
289+
rm ident.i &&
290+
git checkout -- ident.i &&
291+
292+
test_must_fail git status &&
293+
294+
git config --unset core.gvfs
295+
'
296+
268297
test_expect_success 'disable filter with empty override' '
269298
test_config_global filter.disable.smudge false &&
270299
test_config_global filter.disable.clean false &&

0 commit comments

Comments
 (0)