Skip to content

Commit

Permalink
Fix wrong filename listing bug in git-ls-tree.
Browse files Browse the repository at this point in the history 
This patch fixes a bug in git-ls-tree in which the wrong filenames are
listed if the exact same file and directory contents are present in
another location in the tree.

Added a new series of test cases for directory and filename handling.

Signed-off-by: Robert Fitzsimons <robfitz@273k.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
robfitz@273k.net authored and Junio C Hamano committed Oct 7, 2005
1 parent ab18247 commit ab1630a
Show file tree
Hide file tree
Showing 2 changed files with 189 additions and 26 deletions.
55 changes: 29 additions & 26 deletions ls-tree.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,13 @@ static int prepare_children(struct tree_entry_list *elem)
return 0;
}

static struct tree_entry_list *find_entry(const char *path)
static struct tree_entry_list *find_entry(const char *path, char *pathbuf)
{
const char *next, *slash;
int len;
struct tree_entry_list *elem = &root_entry;
struct tree_entry_list *elem = &root_entry, *oldelem = NULL;

*(pathbuf) = '\0';

/* Find tree element, descending from root, that
* corresponds to the named path, lazily expanding
Expand Down Expand Up @@ -86,6 +88,10 @@ static struct tree_entry_list *find_entry(const char *path)
len = slash - path;
}
if (len) {
if (oldelem) {
pathbuf += sprintf(pathbuf, "%s/", oldelem->name);
}

/* (len == 0) if the original path was "drivers/char/"
* and we have run already two rounds, having elem
* pointing at the drivers/char directory.
Expand All @@ -101,26 +107,15 @@ static struct tree_entry_list *find_entry(const char *path)
}
if (!elem)
return NULL;

oldelem = elem;
}
path = next;
}

return elem;
}

static void show_entry_name(struct tree_entry_list *e)
{
/* This is yucky. The root level is there for
* our convenience but we really want to do a
* forest.
*/
if (e->parent && e->parent != &root_entry) {
show_entry_name(e->parent);
putchar('/');
}
printf("%s", e->name);
}

static const char *entry_type(struct tree_entry_list *e)
{
return (e->directory ? "tree" : "blob");
Expand All @@ -134,28 +129,35 @@ static const char *entry_hex(struct tree_entry_list *e)
}

/* forward declaration for mutually recursive routines */
static int show_entry(struct tree_entry_list *, int);
static int show_entry(struct tree_entry_list *, int, char *pathbuf);

static int show_children(struct tree_entry_list *e, int level)
static int show_children(struct tree_entry_list *e, int level, char *pathbuf)
{
int oldlen = strlen(pathbuf);

if (e != &root_entry)
sprintf(pathbuf + oldlen, "%s/", e->name);

if (prepare_children(e))
die("internal error: ls-tree show_children called with non tree");
e = e->item.tree->entries;
while (e) {
show_entry(e, level);
show_entry(e, level, pathbuf);
e = e->next;
}

pathbuf[oldlen] = '\0';

return 0;
}

static int show_entry(struct tree_entry_list *e, int level)
static int show_entry(struct tree_entry_list *e, int level, char *pathbuf)
{
int err = 0;

if (e != &root_entry) {
printf("%06o %s %s ", e->mode, entry_type(e),
entry_hex(e));
show_entry_name(e);
printf("%06o %s %s %s%s", e->mode, entry_type(e),
entry_hex(e), pathbuf, e->name);
putchar(line_termination);
}

Expand All @@ -176,26 +178,27 @@ static int show_entry(struct tree_entry_list *e, int level)
*/
if (level == 0 && !(ls_options & LS_TREE_ONLY))
/* case (1)-a and (1)-b */
err = err | show_children(e, level+1);
err = err | show_children(e, level+1, pathbuf);
else if (level && ls_options & LS_RECURSIVE)
/* case (2)-b */
err = err | show_children(e, level+1);
err = err | show_children(e, level+1, pathbuf);
}
return err;
}

static int list_one(const char *path)
{
int err = 0;
struct tree_entry_list *e = find_entry(path);
char pathbuf[MAXPATHLEN + 1];
struct tree_entry_list *e = find_entry(path, pathbuf);
if (!e) {
/* traditionally ls-tree does not complain about
* missing path. We may change this later to match
* what "/bin/ls -a" does, which is to complain.
*/
return err;
}
err = err | show_entry(e, 0);
err = err | show_entry(e, 0, pathbuf);
return err;
}

Expand Down
160 changes: 160 additions & 0 deletions t/t3101-ls-tree-dirname.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@
#!/bin/sh
#
# Copyright (c) 2005 Junio C Hamano
# Copyright (c) 2005 Robert Fitzsimons
#

test_description='git-ls-tree directory and filenames handling.
This test runs git-ls-tree with the following in a tree.
1.txt - a file
2.txt - a file
path0/a/b/c/1.txt - a file in a directory
path1/b/c/1.txt - a file in a directory
path2/1.txt - a file in a directory
path3/1.txt - a file in a directory
path3/2.txt - a file in a directory
Test the handling of mulitple directories which have matching file
entries. Also test odd filename and missing entries handling.
'
. ./test-lib.sh

test_expect_success \
'setup' \
'echo 111 >1.txt &&
echo 222 >2.txt &&
mkdir path0 path0/a path0/a/b path0/a/b/c &&
echo 111 >path0/a/b/c/1.txt &&
mkdir path1 path1/b path1/b/c &&
echo 111 >path1/b/c/1.txt &&
mkdir path2 &&
echo 111 >path2/1.txt &&
mkdir path3 &&
echo 111 >path3/1.txt &&
echo 222 >path3/2.txt &&
find *.txt path* \( -type f -o -type l \) -print |
xargs git-update-index --add &&
tree=`git-write-tree` &&
echo $tree'

_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
diff -u expected check
}

test_expect_success \
'ls-tree plain' \
'git-ls-tree $tree >current &&
cat >expected <<\EOF &&
100644 blob X 1.txt
100644 blob X 2.txt
040000 tree X path0
040000 tree X path1
040000 tree X path2
040000 tree X path3
EOF
test_output'

test_expect_success \
'ls-tree recursive' \
'git-ls-tree -r $tree >current &&
cat >expected <<\EOF &&
100644 blob X 1.txt
100644 blob X 2.txt
040000 tree X path0
040000 tree X path0/a
040000 tree X path0/a/b
040000 tree X path0/a/b/c
100644 blob X path0/a/b/c/1.txt
040000 tree X path1
040000 tree X path1/b
040000 tree X path1/b/c
100644 blob X path1/b/c/1.txt
040000 tree X path2
100644 blob X path2/1.txt
040000 tree X path3
100644 blob X path3/1.txt
100644 blob X path3/2.txt
EOF
test_output'

test_expect_success \
'ls-tree filter 1.txt' \
'git-ls-tree $tree 1.txt >current &&
cat >expected <<\EOF &&
100644 blob X 1.txt
EOF
test_output'

test_expect_success \
'ls-tree filter path1/b/c/1.txt' \
'git-ls-tree $tree path1/b/c/1.txt >current &&
cat >expected <<\EOF &&
100644 blob X path1/b/c/1.txt
EOF
test_output'

test_expect_success \
'ls-tree filter all 1.txt files' \
'git-ls-tree $tree 1.txt path0/a/b/c/1.txt path1/b/c/1.txt path2/1.txt path3/1.txt >current &&
cat >expected <<\EOF &&
100644 blob X 1.txt
100644 blob X path0/a/b/c/1.txt
100644 blob X path1/b/c/1.txt
100644 blob X path2/1.txt
100644 blob X path3/1.txt
EOF
test_output'

test_expect_success \
'ls-tree filter directories' \
'git-ls-tree $tree path3 path2 path0/a/b/c path1/b/c path0/a >current &&
cat >expected <<\EOF &&
040000 tree X path3
100644 blob X path3/1.txt
100644 blob X path3/2.txt
040000 tree X path2
100644 blob X path2/1.txt
040000 tree X path0/a/b/c
100644 blob X path0/a/b/c/1.txt
040000 tree X path1/b/c
100644 blob X path1/b/c/1.txt
040000 tree X path0/a
040000 tree X path0/a/b
EOF
test_output'

test_expect_success \
'ls-tree filter odd names' \
'git-ls-tree $tree 1.txt /1.txt //1.txt path3/1.txt /path3/1.txt //path3//1.txt path3 /path3/ path3// >current &&
cat >expected <<\EOF &&
100644 blob X 1.txt
100644 blob X 1.txt
100644 blob X 1.txt
100644 blob X path3/1.txt
100644 blob X path3/1.txt
100644 blob X path3/1.txt
040000 tree X path3
100644 blob X path3/1.txt
100644 blob X path3/2.txt
040000 tree X path3
100644 blob X path3/1.txt
100644 blob X path3/2.txt
040000 tree X path3
100644 blob X path3/1.txt
100644 blob X path3/2.txt
EOF
test_output'

test_expect_success \
'ls-tree filter missing files and extra slashes' \
'git-ls-tree $tree 1.txt/ abc.txt path3//23.txt path3/2.txt/// >current &&
cat >expected <<\EOF &&
EOF
test_output'

test_done

0 comments on commit ab1630a

Please sign in to comment.