a69dd585fc
When run from a subdirectory, even though we filtered the output
based on where we were using pathspec, we wrote out the
repository relative paths, not subtree relative paths. This
changes things so that it shows only the current subdirectory
relative paths.
For example, in Documentation subdirectory of git itself, this
used to be the case:
$ git-ls-tree --name-only HEAD | grep how
Documentation/git-show-branch.txt
Documentation/git-show-index.txt
Documentation/howto-index.sh
Documentation/howto
But now it does this instead:
$ git-ls-tree --name-only HEAD | grep how
git-show-branch.txt
git-show-index.txt
howto-index.sh
howto
There are two things to keep in mind.
1. This shows nothing.
$ git-ls-tree --name-only HEAD ../ppc/
This is to make things consistent with ls-files, which
refuses relative path that goes uplevel.
2. These show things in full repository relative paths. In this
case, paths outside the current subdirectory are also shown.
$ git-ls-tree --name-only --full-name HEAD | grep how
Documentation/git-show-branch.txt
Documentation/git-show-index.txt
Documentation/howto-index.sh
Documentation/howto
$ git-ls-tree --name-only --full-name HEAD ../ppc/
ppc/sha1.c
ppc/sha1.h
ppc/sha1ppc.S
The flag --full-name gives the same behaviour as 1.0, so it
ought to be the default if we really care about the backward
compatibility, but in practice no Porcelain runs ls-tree from a
subdirectory yet, and without --full-name is more human
friendly, so hopefully the default being not --full-name would
be acceptable.
Signed-off-by: Junio C Hamano <junkio@cox.net>
141 lines
3.0 KiB
C
141 lines
3.0 KiB
C
/*
|
|
* GIT - The information manager from hell
|
|
*
|
|
* Copyright (C) Linus Torvalds, 2005
|
|
*/
|
|
#include "cache.h"
|
|
#include "blob.h"
|
|
#include "tree.h"
|
|
#include "quote.h"
|
|
|
|
static int line_termination = '\n';
|
|
#define LS_RECURSIVE 1
|
|
#define LS_TREE_ONLY 2
|
|
#define LS_SHOW_TREES 4
|
|
#define LS_NAME_ONLY 8
|
|
static int ls_options = 0;
|
|
const char **pathspec;
|
|
static int chomp_prefix = 0;
|
|
static const char *prefix;
|
|
|
|
static const char ls_tree_usage[] =
|
|
"git-ls-tree [-d] [-r] [-t] [-z] [--name-only] [--name-status] [--full-name] <tree-ish> [path...]";
|
|
|
|
static int show_recursive(const char *base, int baselen, const char *pathname)
|
|
{
|
|
const char **s;
|
|
|
|
if (ls_options & LS_RECURSIVE)
|
|
return 1;
|
|
|
|
s = pathspec;
|
|
if (!s)
|
|
return 0;
|
|
|
|
for (;;) {
|
|
const char *spec = *s++;
|
|
int len, speclen;
|
|
|
|
if (!spec)
|
|
return 0;
|
|
if (strncmp(base, spec, baselen))
|
|
continue;
|
|
len = strlen(pathname);
|
|
spec += baselen;
|
|
speclen = strlen(spec);
|
|
if (speclen <= len)
|
|
continue;
|
|
if (memcmp(pathname, spec, len))
|
|
continue;
|
|
return 1;
|
|
}
|
|
}
|
|
|
|
static int show_tree(unsigned char *sha1, const char *base, int baselen,
|
|
const char *pathname, unsigned mode, int stage)
|
|
{
|
|
int retval = 0;
|
|
const char *type = "blob";
|
|
|
|
if (S_ISDIR(mode)) {
|
|
if (show_recursive(base, baselen, pathname)) {
|
|
retval = READ_TREE_RECURSIVE;
|
|
if (!(ls_options & LS_SHOW_TREES))
|
|
return retval;
|
|
}
|
|
type = "tree";
|
|
}
|
|
else if (ls_options & LS_TREE_ONLY)
|
|
return 0;
|
|
|
|
if (chomp_prefix &&
|
|
(baselen < chomp_prefix || memcmp(prefix, base, chomp_prefix)))
|
|
return 0;
|
|
|
|
if (!(ls_options & LS_NAME_ONLY))
|
|
printf("%06o %s %s\t", mode, type, sha1_to_hex(sha1));
|
|
write_name_quoted(base + chomp_prefix, baselen - chomp_prefix,
|
|
pathname,
|
|
line_termination, stdout);
|
|
putchar(line_termination);
|
|
return retval;
|
|
}
|
|
|
|
int main(int argc, const char **argv)
|
|
{
|
|
unsigned char sha1[20];
|
|
char *buf;
|
|
unsigned long size;
|
|
|
|
prefix = setup_git_directory();
|
|
if (prefix && *prefix)
|
|
chomp_prefix = strlen(prefix);
|
|
while (1 < argc && argv[1][0] == '-') {
|
|
switch (argv[1][1]) {
|
|
case 'z':
|
|
line_termination = 0;
|
|
break;
|
|
case 'r':
|
|
ls_options |= LS_RECURSIVE;
|
|
break;
|
|
case 'd':
|
|
ls_options |= LS_TREE_ONLY;
|
|
break;
|
|
case 't':
|
|
ls_options |= LS_SHOW_TREES;
|
|
break;
|
|
case '-':
|
|
if (!strcmp(argv[1]+2, "name-only") ||
|
|
!strcmp(argv[1]+2, "name-status")) {
|
|
ls_options |= LS_NAME_ONLY;
|
|
break;
|
|
}
|
|
if (!strcmp(argv[1]+2, "full-name")) {
|
|
chomp_prefix = 0;
|
|
break;
|
|
}
|
|
/* otherwise fallthru */
|
|
default:
|
|
usage(ls_tree_usage);
|
|
}
|
|
argc--; argv++;
|
|
}
|
|
/* -d -r should imply -t, but -d by itself should not have to. */
|
|
if ( (LS_TREE_ONLY|LS_RECURSIVE) ==
|
|
((LS_TREE_ONLY|LS_RECURSIVE) & ls_options))
|
|
ls_options |= LS_SHOW_TREES;
|
|
|
|
if (argc < 2)
|
|
usage(ls_tree_usage);
|
|
if (get_sha1(argv[1], sha1) < 0)
|
|
usage(ls_tree_usage);
|
|
|
|
pathspec = get_pathspec(prefix, argv + 2);
|
|
buf = read_object_with_reference(sha1, "tree", &size, NULL);
|
|
if (!buf)
|
|
die("not a tree object");
|
|
read_tree_recursive(buf, size, "", 0, 0, pathspec, show_tree);
|
|
|
|
return 0;
|
|
}
|