@matheusbsbs / matheus-bagliano / commits / 911e9e88ab

t1404: mark directory/file conflict tests with REFFILES

The files backend uses file system locking on individual refs, which means a directory/file conflict can prevent locks being taken. For example, in a repo with just the ref "foo", an update (DELETE "foo") + (ADD "foo/bar") cannot be executed in the files backend, as one cannot take a lock on foo/bar. The current reftable proof-of-concept integration supports these tranactions, as the result is a repo with just "foo/bar", which has no directory/file conflict. Signed-off-by: Han-Wen Nienhuys <hanwen@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Han-Wen Nienhuys committed Nov 29, 2021 at 18:20 UTC 911e9e88abeceb23fd6780d2cb6cf623957290a4

1 file changed +16 -16

t/t1404-update-ref-errors.sh

+16 -16

@@ -261,69 +261,69 @@ test_expect_success REFFILES 'empty directory should not fool 1-arg delete' '

261 git update-ref --stdin

262 '

263

264 -test_expect_success 'D/F conflict prevents add long + delete short' '

264 +test_expect_success REFFILES 'D/F conflict prevents add long + delete short' '

265 df_test refs/df-al-ds --add-del foo/bar foo

266 '

267

268 -test_expect_success 'D/F conflict prevents add short + delete long' '

268 +test_expect_success REFFILES 'D/F conflict prevents add short + delete long' '

269 df_test refs/df-as-dl --add-del foo foo/bar

270 '

271

272 -test_expect_success 'D/F conflict prevents delete long + add short' '

272 +test_expect_success REFFILES 'D/F conflict prevents delete long + add short' '

273 df_test refs/df-dl-as --del-add foo/bar foo

274 '

275

276 -test_expect_success 'D/F conflict prevents delete short + add long' '

276 +test_expect_success REFFILES 'D/F conflict prevents delete short + add long' '

277 df_test refs/df-ds-al --del-add foo foo/bar

278 '

279

280 -test_expect_success 'D/F conflict prevents add long + delete short packed' '

280 +test_expect_success REFFILES 'D/F conflict prevents add long + delete short packed' '

281 df_test refs/df-al-dsp --pack --add-del foo/bar foo

282 '

283

284 -test_expect_success 'D/F conflict prevents add short + delete long packed' '

284 +test_expect_success REFFILES 'D/F conflict prevents add short + delete long packed' '

285 df_test refs/df-as-dlp --pack --add-del foo foo/bar

286 '

287

288 -test_expect_success 'D/F conflict prevents delete long packed + add short' '

288 +test_expect_success REFFILES 'D/F conflict prevents delete long packed + add short' '

289 df_test refs/df-dlp-as --pack --del-add foo/bar foo

290 '

291

292 -test_expect_success 'D/F conflict prevents delete short packed + add long' '

292 +test_expect_success REFFILES 'D/F conflict prevents delete short packed + add long' '

293 df_test refs/df-dsp-al --pack --del-add foo foo/bar

294 '

295

296 # Try some combinations involving symbolic refs...

297

298 -test_expect_success 'D/F conflict prevents indirect add long + delete short' '

298 +test_expect_success REFFILES 'D/F conflict prevents indirect add long + delete short' '

299 df_test refs/df-ial-ds --sym-add --add-del foo/bar foo

300 '

301

302 -test_expect_success 'D/F conflict prevents indirect add long + indirect delete short' '

302 +test_expect_success REFFILES 'D/F conflict prevents indirect add long + indirect delete short' '

303 df_test refs/df-ial-ids --sym-add --sym-del --add-del foo/bar foo

304 '

305

306 -test_expect_success 'D/F conflict prevents indirect add short + indirect delete long' '

306 +test_expect_success REFFILES 'D/F conflict prevents indirect add short + indirect delete long' '

307 df_test refs/df-ias-idl --sym-add --sym-del --add-del foo foo/bar

308 '

309

310 -test_expect_success 'D/F conflict prevents indirect delete long + indirect add short' '

310 +test_expect_success REFFILES 'D/F conflict prevents indirect delete long + indirect add short' '

311 df_test refs/df-idl-ias --sym-add --sym-del --del-add foo/bar foo

312 '

313

314 -test_expect_success 'D/F conflict prevents indirect add long + delete short packed' '

314 +test_expect_success REFFILES 'D/F conflict prevents indirect add long + delete short packed' '

315 df_test refs/df-ial-dsp --sym-add --pack --add-del foo/bar foo

316 '

317

318 -test_expect_success 'D/F conflict prevents indirect add long + indirect delete short packed' '

318 +test_expect_success REFFILES 'D/F conflict prevents indirect add long + indirect delete short packed' '

319 df_test refs/df-ial-idsp --sym-add --sym-del --pack --add-del foo/bar foo

320 '

321

322 -test_expect_success 'D/F conflict prevents add long + indirect delete short packed' '

322 +test_expect_success REFFILES 'D/F conflict prevents add long + indirect delete short packed' '

323 df_test refs/df-al-idsp --sym-del --pack --add-del foo/bar foo

324 '

325

326 -test_expect_success 'D/F conflict prevents indirect delete long packed + indirect add short' '

326 +test_expect_success REFFILES 'D/F conflict prevents indirect delete long packed + indirect add short' '

327 df_test refs/df-idlp-ias --sym-add --sym-del --pack --del-add foo/bar foo

328 '

329