Skip to content

Commit

Permalink
[PATCH] Rewrite ls-tree to behave more like "/bin/ls -a"
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano authored and Linus Torvalds committed May 29, 2005
1 parent 2bc2564 commit 6af1f01
Show file tree
Hide file tree
Showing 5 changed files with 195 additions and 156 deletions.
20 changes: 12 additions & 8 deletions Documentation/git-ls-tree.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,42 +4,46 @@ v0.1, May 2005

NAME
----
git-ls-tree - Displays a tree object in human readable form
git-ls-tree - Lists the contents of a tree object.


SYNOPSIS
--------
'git-ls-tree' [-r] [-z] <tree-ish> [paths...]
'git-ls-tree' [-d] [-r] [-z] <tree-ish> [paths...]

DESCRIPTION
-----------
Converts the tree object to a human readable (and script processable)
form.
Lists the contents of a tree object, like what "/bin/ls -a" does
in the current working directory.

OPTIONS
-------
<tree-ish>::
Id of a tree.

-d::
show only the named tree entry itself, not its children

-r::
recurse into sub-trees

-z::
\0 line termination on output

paths::
Optionally, restrict the output of git-ls-tree to specific
paths. Directories will only list their tree blob ids.
Implies -r.
When paths are given, shows them. Otherwise implicitly
uses the root level of the tree as the sole path argument.


Output Format
-------------
<mode>\t <type>\t <object>\t <file>
<mode> SP <type> SP <object> TAB <file>


Author
------
Written by Linus Torvalds <torvalds@osdl.org>
Completely rewritten from scratch by Junio C Hamano <junkio@cox.net>

Documentation
--------------
Expand Down
Loading

0 comments on commit 6af1f01

Please sign in to comment.