ls: dummy value in place of size for dirs
License: MIT Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
Łukasz Magiera committed
Jan 12, 2019 at 14:34 UTC
3b5c0712f9874cbb22f5cda3f9c7618e80769144
3 files changed
+10
-10
core/commands/ls.go
+1
-1
@@ -307,7 +307,7 @@ func tabularOutput(req *cmds.Request, w io.Writer, out *LsOutput, lastObjectHash
307
308
switch {
309
case link.Type == unixfs.TDirectory && size:
310
- s = "%[1]s\t\t%[3]s/\n"
310
+ s = "%[1]s\t-\t%[3]s/\n"
311
case link.Type == unixfs.TDirectory && !size:
312
s = "%[1]s\t%[3]s/\n"
313
case size:
test/sharness/t0045-ls.sh
+8
-8
@@ -45,8 +45,8 @@ EOF
45
test_expect_success "'ipfs ls <three dir hashes>' output looks good" '
46
cat <<-\EOF >expected_ls &&
47
QmfNy183bXiRVyrhyWtq3TwHn79yHEkiAGFr18P7YNzESj:
48
-QmSix55yz8CzWXf5ZVM9vgEvijnEeeXiTSarVtsqiiCJss d1/
49
-QmR3jhV4XpxxPjPT3Y8vNnWvWNvakdcT3H6vqpRBsX1MLy d2/
48
+QmSix55yz8CzWXf5ZVM9vgEvijnEeeXiTSarVtsqiiCJss - d1/
49
+QmR3jhV4XpxxPjPT3Y8vNnWvWNvakdcT3H6vqpRBsX1MLy - d2/
50
QmeomffUNfmQy76CQGy9NdmqEnnHU9soCexBnGU3ezPHVH 5 f1
51
QmNtocSs7MoDkJMc1RkyisCSKvLadujPsfJfSdJ3e1eA1M 5 f2
52
@@ -92,8 +92,8 @@ EOF
92
cat <<-\EOF >expected_ls_headers &&
93
QmfNy183bXiRVyrhyWtq3TwHn79yHEkiAGFr18P7YNzESj:
94
Hash Size Name
95
-QmSix55yz8CzWXf5ZVM9vgEvijnEeeXiTSarVtsqiiCJss d1/
96
-QmR3jhV4XpxxPjPT3Y8vNnWvWNvakdcT3H6vqpRBsX1MLy d2/
95
+QmSix55yz8CzWXf5ZVM9vgEvijnEeeXiTSarVtsqiiCJss - d1/
96
+QmR3jhV4XpxxPjPT3Y8vNnWvWNvakdcT3H6vqpRBsX1MLy - d2/
97
QmeomffUNfmQy76CQGy9NdmqEnnHU9soCexBnGU3ezPHVH 5 f1
98
QmNtocSs7MoDkJMc1RkyisCSKvLadujPsfJfSdJ3e1eA1M 5 f2
99
@@ -147,8 +147,8 @@ EOF
147
test_expect_success "'ipfs ls --stream <three dir hashes>' output looks good" '
148
cat <<-\EOF >expected_ls_stream &&
149
QmfNy183bXiRVyrhyWtq3TwHn79yHEkiAGFr18P7YNzESj:
150
-QmSix55yz8CzWXf5ZVM9vgEvijnEeeXiTSarVtsqiiCJss d1/
151
-QmR3jhV4XpxxPjPT3Y8vNnWvWNvakdcT3H6vqpRBsX1MLy d2/
150
+QmSix55yz8CzWXf5ZVM9vgEvijnEeeXiTSarVtsqiiCJss - d1/
151
+QmR3jhV4XpxxPjPT3Y8vNnWvWNvakdcT3H6vqpRBsX1MLy - d2/
152
QmeomffUNfmQy76CQGy9NdmqEnnHU9soCexBnGU3ezPHVH 5 f1
153
QmNtocSs7MoDkJMc1RkyisCSKvLadujPsfJfSdJ3e1eA1M 5 f2
154
@@ -194,8 +194,8 @@ EOF
194
cat <<-\EOF >expected_ls_stream_headers &&
195
QmfNy183bXiRVyrhyWtq3TwHn79yHEkiAGFr18P7YNzESj:
196
Hash Size Name
197
-QmSix55yz8CzWXf5ZVM9vgEvijnEeeXiTSarVtsqiiCJss d1/
198
-QmR3jhV4XpxxPjPT3Y8vNnWvWNvakdcT3H6vqpRBsX1MLy d2/
197
+QmSix55yz8CzWXf5ZVM9vgEvijnEeeXiTSarVtsqiiCJss - d1/
198
+QmR3jhV4XpxxPjPT3Y8vNnWvWNvakdcT3H6vqpRBsX1MLy - d2/
199
QmeomffUNfmQy76CQGy9NdmqEnnHU9soCexBnGU3ezPHVH 5 f1
200
QmNtocSs7MoDkJMc1RkyisCSKvLadujPsfJfSdJ3e1eA1M 5 f2
201
test/sharness/t0051-object.sh
+1
-1
@@ -292,7 +292,7 @@ test_object_cmd() {
292
'
293
294
test_expect_success "output looks good" '
295
- echo "QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn foo/" > patched_exp &&
295
+ echo "QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn - foo/" > patched_exp &&
296
test_cmp patched_exp patched_output
297
'
298