mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ls-tree: remove path filtering logic in show_tree

Browse Source 
ls-tree uses read_tree_recursive() which already does path filtering
using pathspec. No need to filter one more time based on prefix
only. "ls-tree ../somewhere" does not work because of
this. write_name_quotedpfx() can now be retired because nobody else
uses it.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy
2014-11-30 16:05:01 +07:00
committed by Junio C Hamano
parent 6a0b0b6de9
commit 1cf9952db2
4 changed files with 15 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
builtin/ls-tree.c
View File

@ -65,6 +65,7 @@ static int show_tree(const unsigned char *sha1, struct strbuf *base,
const char *pathname, unsigned mode, int stage, void *context)
{
int retval = 0;
int baselen;
const char *type = blob_type;
if (S_ISGITLINK(mode)) {
@ -89,11 +90,6 @@ static int show_tree(const unsigned char *sha1, struct strbuf *base,
else if (ls_options & LS_TREE_ONLY)
return 0;
if (chomp_prefix &&
(base->len < chomp_prefix ||
memcmp(ls_tree_prefix, base->buf, chomp_prefix)))
return 0;
if (!(ls_options & LS_NAME_ONLY)) {
if (ls_options & LS_SHOW_SIZE) {
char size_text[24];
@ -113,8 +109,12 @@ static int show_tree(const unsigned char *sha1, struct strbuf *base,
printf("%06o %s %s\t", mode, type,
find_unique_abbrev(sha1, abbrev));
}
write_name_quotedpfx(base->buf + chomp_prefix, base->len - chomp_prefix,
pathname, stdout, line_termination);
baselen = base->len;
strbuf_addstr(base, pathname);
write_name_quoted_relative(base->buf,
chomp_prefix ? ls_tree_prefix : NULL,
stdout, line_termination);
strbuf_setlen(base, baselen);
return retval;
}