diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-05-28 00:05:38 -0700 |
|---|---|---|
| committer |  Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-29 11:40:40 -0700 |
| commit | 6af1f0192ff8740fe77db7cf02c739ccfbdf119c (patch) | |
| tree | 944858d4fb8a907b52ea340eefd6b66d5f156393 /t | |
| parent | [PATCH] Adjust diff-helper to diff-tree -v -z changes. (diff) | |
| download | tgif-6af1f0192ff8740fe77db7cf02c739ccfbdf119c.tar.xz | |
[PATCH] Rewrite ls-tree to behave more like "/bin/ls -a"
This is a complete rewrite of ls-tree to make it behave more
like what "/bin/ls -a" does in the current working directory.
Namely, the changes are:
- Unlike the old ls-tree behaviour that used paths arguments to
restrict output (not that it worked as intended---as pointed
out in the mailing list discussion, it was quite incoherent),
this rewrite uses paths arguments to specify what to show.
- Without arguments, it implicitly uses the root level as its
sole argument ("/bin/ls -a" behaves as if "." is given
without argument).
- Without -r (recursive) flag, it shows the named blob (either
file or symlink), or the named tree and its immediate
children.
- With -r flag, it shows the named path, and recursively
descends into it if it is a tree.
- With -d flag, it shows the named path and does not show its
children even if the path is a tree, nor descends into it
recursively.
This is still request-for-comments patch. There is no mailing
list consensus that this proposed new behaviour is a good one.
The patch to t/t3100-ls-tree-restrict.sh illustrates
user-visible behaviour changes. Namely:
* "git-ls-tree $tree path1 path0" lists path1 first and then
path0. It used to use paths as an output restrictor and
showed output in cache entry order (i.e. path0 first and then
path1) regardless of the order of paths arguments.
* "git-ls-tree $tree path2" lists path2 and its immediate
children but having explicit paths argument does not imply
recursive behaviour anymore, hence paths/baz is shown but not
paths/baz/b.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 't')
| -rw-r--r-- | t/t3100-ls-tree-restrict.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/t/t3100-ls-tree-restrict.sh b/t/t3100-ls-tree-restrict.sh index 70fa9acee7..02d93ebe6f 100644 --- a/t/t3100-ls-tree-restrict.sh +++ b/t/t3100-ls-tree-restrict.sh @@ -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 EOF test_output' @@ -85,7 +85,6 @@ test_expect_success \ 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 EOF |