mirror of
https://github.com/git/git.git
synced 2024-11-05 00:37:55 +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)
158 lines
3.6 KiB
Bash
Executable file
158 lines
3.6 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
#
|
|
|
|
test_description='git-ls-tree test.
|
|
|
|
This test runs git-ls-tree with the following in a tree.
|
|
|
|
path0 - a file
|
|
path1 - a symlink
|
|
path2/foo - a file in a directory
|
|
path2/bazbo - a symlink in a directory
|
|
path2/baz/b - a file in a directory in a directory
|
|
|
|
The new path restriction code should do the right thing for path2 and
|
|
path2/baz. Also path0/ should snow nothing.
|
|
'
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success \
|
|
'setup' \
|
|
'mkdir path2 path2/baz &&
|
|
echo Hi >path0 &&
|
|
ln -s path0 path1 &&
|
|
echo Lo >path2/foo &&
|
|
ln -s ../path1 path2/bazbo &&
|
|
echo Mi >path2/baz/b &&
|
|
find 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 path0
|
|
120000 blob X path1
|
|
040000 tree X path2
|
|
EOF
|
|
test_output'
|
|
|
|
test_expect_success \
|
|
'ls-tree recursive' \
|
|
'git-ls-tree -r $tree >current &&
|
|
cat >expected <<\EOF &&
|
|
100644 blob X path0
|
|
120000 blob X path1
|
|
100644 blob X path2/baz/b
|
|
120000 blob X path2/bazbo
|
|
100644 blob X path2/foo
|
|
EOF
|
|
test_output'
|
|
|
|
test_expect_success \
|
|
'ls-tree recursive with -t' \
|
|
'git-ls-tree -r -t $tree >current &&
|
|
cat >expected <<\EOF &&
|
|
100644 blob X path0
|
|
120000 blob X path1
|
|
040000 tree X path2
|
|
040000 tree X path2/baz
|
|
100644 blob X path2/baz/b
|
|
120000 blob X path2/bazbo
|
|
100644 blob X path2/foo
|
|
EOF
|
|
test_output'
|
|
|
|
test_expect_success \
|
|
'ls-tree recursive with -d' \
|
|
'git-ls-tree -r -d $tree >current &&
|
|
cat >expected <<\EOF &&
|
|
040000 tree X path2
|
|
040000 tree X path2/baz
|
|
EOF
|
|
test_output'
|
|
|
|
test_expect_success \
|
|
'ls-tree filtered with path' \
|
|
'git-ls-tree $tree path >current &&
|
|
cat >expected <<\EOF &&
|
|
EOF
|
|
test_output'
|
|
|
|
|
|
# it used to be path1 and then path0, but with pathspec semantics
|
|
# they are shown in canonical order.
|
|
test_expect_success \
|
|
'ls-tree filtered with path1 path0' \
|
|
'git-ls-tree $tree path1 path0 >current &&
|
|
cat >expected <<\EOF &&
|
|
100644 blob X path0
|
|
120000 blob X path1
|
|
EOF
|
|
test_output'
|
|
|
|
test_expect_success \
|
|
'ls-tree filtered with path0/' \
|
|
'git-ls-tree $tree path0/ >current &&
|
|
cat >expected <<\EOF &&
|
|
EOF
|
|
test_output'
|
|
|
|
# It used to show path2 and its immediate children but
|
|
# with pathspec semantics it shows only path2
|
|
test_expect_success \
|
|
'ls-tree filtered with path2' \
|
|
'git-ls-tree $tree path2 >current &&
|
|
cat >expected <<\EOF &&
|
|
040000 tree X path2
|
|
EOF
|
|
test_output'
|
|
|
|
# ... and path2/ shows the children.
|
|
test_expect_success \
|
|
'ls-tree filtered with path2/' \
|
|
'git-ls-tree $tree path2/ >current &&
|
|
cat >expected <<\EOF &&
|
|
040000 tree X path2/baz
|
|
120000 blob X path2/bazbo
|
|
100644 blob X path2/foo
|
|
EOF
|
|
test_output'
|
|
|
|
# The same change -- exact match does not show children of
|
|
# path2/baz
|
|
test_expect_success \
|
|
'ls-tree filtered with path2/baz' \
|
|
'git-ls-tree $tree path2/baz >current &&
|
|
cat >expected <<\EOF &&
|
|
040000 tree X path2/baz
|
|
EOF
|
|
test_output'
|
|
|
|
test_expect_success \
|
|
'ls-tree filtered with path2/bak' \
|
|
'git-ls-tree $tree path2/bak >current &&
|
|
cat >expected <<\EOF &&
|
|
EOF
|
|
test_output'
|
|
|
|
test_expect_success \
|
|
'ls-tree -t filtered with path2/bak' \
|
|
'git-ls-tree -t $tree path2/bak >current &&
|
|
cat >expected <<\EOF &&
|
|
040000 tree X path2
|
|
EOF
|
|
test_output'
|
|
|
|
test_done
|