Merge pull request #2309 from siebenHeaven/ls_r_output_inconsistency

ls: Fix minor output mismatch
This commit is contained in:
Sylvestre Ledru
2021-05-30 16:24:26 +02:00
committed by GitHub
2 changed files with 7 additions and 1 deletions
+1 -1
View File
@@ -1223,7 +1223,7 @@ fn list(locs: Vec<String>, config: Config) -> i32 {
sort_entries(&mut dirs, &config);
for dir in dirs {
if locs.len() > 1 {
if locs.len() > 1 || config.recursive {
let _ = writeln!(out, "\n{}:", dir.p_buf.display());
}
enter_directory(&dir, &config, &mut out);
+6
View File
@@ -899,6 +899,12 @@ fn test_ls_recursive() {
scene.ucmd().arg("a").succeeds();
scene.ucmd().arg("a/a").succeeds();
scene
.ucmd()
.arg("z")
.arg("-R")
.succeeds()
.stdout_contains(&"z:");
let result = scene
.ucmd()
.arg("--color=never")