fix(cmds): add: reject files with different import dir
Lucas Molas committed
Apr 5, 2022 at 14:00 UTC
4e2028d19c1d81cf9726875154d3749cdae7cfd2
3 files changed
+5
-9
go.mod
+1
-1
@@ -31,7 +31,7 @@ require (
31
github.com/ipfs/go-graphsync v0.11.0
32
github.com/ipfs/go-ipfs-blockstore v1.2.0
33
github.com/ipfs/go-ipfs-chunker v0.0.5
34
- github.com/ipfs/go-ipfs-cmds v0.8.0
34
+ github.com/ipfs/go-ipfs-cmds v0.8.1
35
github.com/ipfs/go-ipfs-exchange-interface v0.1.0
36
github.com/ipfs/go-ipfs-exchange-offline v0.2.0
37
github.com/ipfs/go-ipfs-files v0.0.9
go.sum
+2
-2
@@ -518,8 +518,8 @@ github.com/ipfs/go-ipfs-blocksutil v0.0.1/go.mod h1:Yq4M86uIOmxmGPUHv/uI7uKqZNtL
518
github.com/ipfs/go-ipfs-chunker v0.0.1/go.mod h1:tWewYK0we3+rMbOh7pPFGDyypCtvGcBFymgY4rSDLAw=
519
github.com/ipfs/go-ipfs-chunker v0.0.5 h1:ojCf7HV/m+uS2vhUGWcogIIxiO5ubl5O57Q7NapWLY8=
520
github.com/ipfs/go-ipfs-chunker v0.0.5/go.mod h1:jhgdF8vxRHycr00k13FM8Y0E+6BoalYeobXmUyTreP8=
521
-github.com/ipfs/go-ipfs-cmds v0.8.0 h1:M7apkPxhGe7I3rcKuQ8xRJLIPdaEqaZhJz0uPZEE8EU=
522
-github.com/ipfs/go-ipfs-cmds v0.8.0/go.mod h1:y0bflH6m4g6ary4HniYt98UqbrVnRxmRarzeMdLIUn0=
521
+github.com/ipfs/go-ipfs-cmds v0.8.1 h1:El661DBWqdqwgz7B9xwKyUpigwqk6BBBHb5B8DfJP00=
522
+github.com/ipfs/go-ipfs-cmds v0.8.1/go.mod h1:y0bflH6m4g6ary4HniYt98UqbrVnRxmRarzeMdLIUn0=
523
github.com/ipfs/go-ipfs-delay v0.0.0-20181109222059-70721b86a9a8/go.mod h1:8SP1YXK1M1kXuc4KJZINY3TQQ03J2rwBG9QfXmbRPrw=
524
github.com/ipfs/go-ipfs-delay v0.0.1 h1:r/UXYyRcddO6thwOnhiznIAiSvxMECGgtv35Xs1IeRQ=
525
github.com/ipfs/go-ipfs-delay v0.0.1/go.mod h1:8SP1YXK1M1kXuc4KJZINY3TQQ03J2rwBG9QfXmbRPrw=
test/sharness/t0040-add-and-cat.sh
+2
-6
@@ -346,12 +346,8 @@ test_add_cat_file() {
346
test_cmp expected actual
347
'
348
349
- test_expect_success "ipfs add with multiple files of same name succeeds" '
350
- mkdir -p mountdir/same-file/ &&
351
- cp mountdir/hello.txt mountdir/same-file/hello.txt &&
352
- ipfs add mountdir/hello.txt mountdir/same-file/hello.txt >actual &&
353
- rm mountdir/same-file/hello.txt &&
354
- rmdir mountdir/same-file
349
+ test_expect_success "ipfs add with multiple files of same name and import dir succeeds" '
350
+ ipfs add mountdir/hello.txt mountdir/hello.txt >actual
351
'
352
353
test_expect_success "ipfs add with multiple files of same name output looks good" '