mirror of
https://github.com/git/git.git
synced 2024-11-20 13:54:45 +01:00
5bd74506cd
Now that "git diff" handles stdin and relative paths outside the working tree correctly, we can convert all instances of "diff -u" to "git diff". This commit is really the result of $ perl -pi.bak -e 's/diff -u/git diff/' $(git grep -l "diff -u" t/) Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from commit c699a40d68215c7e44a5b26117a35c8a56fbd387)
139 lines
3.7 KiB
Bash
Executable File
139 lines
3.7 KiB
Bash
Executable File
#!/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
|
|
git diff 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'
|
|
|
|
# Recursive does not show tree nodes anymore...
|
|
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
|
|
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
|
|
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'
|
|
|
|
# I am not so sure about this one after ls-tree doing pathspec match.
|
|
# Having both path0/a and path0/a/b/c makes path0/a redundant, and
|
|
# it behaves as if path0/a/b/c, path1/b/c, path2 and path3 are specified.
|
|
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 path0/a/b/c
|
|
040000 tree X path1/b/c
|
|
040000 tree X path2
|
|
040000 tree X path3
|
|
EOF
|
|
test_output'
|
|
|
|
# Again, duplicates are filtered away so this is equivalent to
|
|
# having 1.txt and path3
|
|
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 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
|