diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-05-26 14:38:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-26 15:18:55 -0700 |
| commit | 2eab945e865317cb7d390aec214303f1d931b53a (patch) | |
| tree | dbec0de73e52d5b6d0740dd2e226d3ce8e2e51fd /t/t3100-ls-tree-restrict.sh | |
| parent | 6d3a5077ddb78a73fe26b154c459bc4731bca0dd (diff) | |
| download | git-2eab945e865317cb7d390aec214303f1d931b53a.tar.gz | |
[PATCH] Make ls-* output consistent with diff-* output format.
Use SP as the column separator except the ones before path which
uses TAB, to make the output format consistent across ls-* and
diff-* commands.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 't/t3100-ls-tree-restrict.sh')
| -rw-r--r-- | t/t3100-ls-tree-restrict.sh | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/t/t3100-ls-tree-restrict.sh b/t/t3100-ls-tree-restrict.sh index 095b328943..70fa9acee7 100644 --- a/t/t3100-ls-tree-restrict.sh +++ b/t/t3100-ls-tree-restrict.sh @@ -34,7 +34,7 @@ test_expect_success \ _x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]' _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40" test_output () { - sed -e "s/ $_x40 / X /" <current >check + sed -e "s/ $_x40 / X /" <current >check diff -u expected check } @@ -42,9 +42,9 @@ test_expect_success \ 'ls-tree plain' \ 'git-ls-tree $tree >current && cat >expected <<\EOF && -100644 blob X path0 -120000 blob X path1 -040000 tree X path2 +100644 blob X path0 +120000 blob X path1 +040000 tree X path2 EOF test_output' @@ -52,13 +52,13 @@ test_expect_success \ 'ls-tree recursive' \ 'git-ls-tree -r $tree >current && cat >expected <<\EOF && -100644 blob X path0 -120000 blob X path1 -040000 tree X path2 -040000 tree X path2/baz -100644 blob X path2/baz/b -120000 blob X path2/bazbo -100644 blob X path2/foo +100644 blob X path0 +120000 blob X path1 +040000 tree X path2 +040000 tree X path2/baz +100644 blob X path2/baz/b +120000 blob X path2/bazbo +100644 blob X path2/foo EOF test_output' @@ -74,8 +74,8 @@ test_expect_success \ 'ls-tree filtered' \ 'git-ls-tree $tree path1 path0 >current && cat >expected <<\EOF && -100644 blob X path0 -120000 blob X path1 +100644 blob X path0 +120000 blob X path1 EOF test_output' @@ -83,11 +83,11 @@ test_expect_success \ 'ls-tree filtered' \ 'git-ls-tree $tree path2 >current && cat >expected <<\EOF && -040000 tree X path2 -040000 tree X path2/baz -100644 blob X path2/baz/b -120000 blob X path2/bazbo -100644 blob X path2/foo +040000 tree X path2 +040000 tree X path2/baz +100644 blob X path2/baz/b +120000 blob X path2/bazbo +100644 blob X path2/foo EOF test_output' @@ -95,8 +95,8 @@ test_expect_success \ 'ls-tree filtered' \ 'git-ls-tree $tree path2/baz >current && cat >expected <<\EOF && -040000 tree X path2/baz -100644 blob X path2/baz/b +040000 tree X path2/baz +100644 blob X path2/baz/b EOF test_output' |