Commit Diff

Commit:
88ba84836c92b3f3755bf4e36d7acf782a753b71
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
ls -1 is a no-op when stdout is redirected to a file; pointed out by naddy
Actions:
Patch | Tree
commit - 854ca8a00969f4f4187b4e30c793021fbb476ee9
commit + 88ba84836c92b3f3755bf4e36d7acf782a753b71
blob - 2cd63ede1fbe95a1473eae9cd7f83f582ecfbc81
blob + c3bf21f542eafcad208d6df25cf8fbad74a2304d
--- regress/cmdline/cleanup.sh
+++ regress/cmdline/cleanup.sh
@@ -67,7 +67,7 @@ test_cleanup_unreferenced_loose_objects() {
 	got ref -r $testroot/repo -d "refs/got/worktree/base-$wt_uuid"
 
 	# cleanup -n should not remove any objects
-	ls -1 -R $testroot/repo/.git/objects > $testroot/objects-before
+	ls -R $testroot/repo/.git/objects > $testroot/objects-before
 	gotadmin cleanup -n -q -r $testroot/repo > $testroot/stdout
 	echo -n > $testroot/stdout.expected
 	cmp -s $testroot/stdout.expected $testroot/stdout
@@ -77,7 +77,7 @@ test_cleanup_unreferenced_loose_objects() {
 		test_done "$testroot" "$ret"
 		return 1
 	fi
-	ls -1 -R $testroot/repo/.git/objects > $testroot/objects-after
+	ls -R $testroot/repo/.git/objects > $testroot/objects-after
 	cmp -s $testroot/objects-before $testroot/objects-after
 	ret="$?"
 	if [ "$ret" != "0" ]; then
@@ -164,7 +164,7 @@ test_cleanup_redundant_loose_objects() {
 	fi
 
 	# cleanup -n should not remove any objects
-	ls -1 -R $testroot/repo/.git/objects > $testroot/objects-before
+	ls -R $testroot/repo/.git/objects > $testroot/objects-before
 	gotadmin cleanup -n -q -r $testroot/repo > $testroot/stdout
 	echo -n > $testroot/stdout.expected
 	cmp -s $testroot/stdout.expected $testroot/stdout
@@ -174,7 +174,7 @@ test_cleanup_redundant_loose_objects() {
 		test_done "$testroot" "$ret"
 		return 1
 	fi
-	ls -1 -R $testroot/repo/.git/objects > $testroot/objects-after
+	ls -R $testroot/repo/.git/objects > $testroot/objects-after
 	cmp -s $testroot/objects-before $testroot/objects-after
 	ret="$?"
 	if [ "$ret" != "0" ]; then