mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
66204988fe
This fixes the problem with ls-tree which failed to show "drivers/char" directory when the user asked for "drivers/char/" from the command line. At the same time, if "drivers/char" were a non directory, "drivers/char/" would not show it. This is consistent with the way diffcore-pathspec has been recently fixed. This adds back the diffcore-pathspec test,dropped when my earlier diffcore-pathspec fix was rejected. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
66 lines
1.7 KiB
Bash
66 lines
1.7 KiB
Bash
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
#
|
|
|
|
test_description='Pathspec restrictions
|
|
|
|
Prepare:
|
|
file0
|
|
path1/file1
|
|
'
|
|
. ./test-lib.sh
|
|
. ../diff-lib.sh ;# test-lib chdir's into trash
|
|
|
|
test_expect_success \
|
|
setup \
|
|
'echo frotz >file0 &&
|
|
mkdir path1 &&
|
|
echo rezrov >path1/file1 &&
|
|
git-update-cache --add file0 path1/file1 &&
|
|
tree=`git-write-tree` &&
|
|
echo "$tree" &&
|
|
echo nitfol >file0 &&
|
|
echo yomin >path1/file1 &&
|
|
git-update-cache file0 path1/file1'
|
|
|
|
cat >expected <<\EOF
|
|
EOF
|
|
test_expect_success \
|
|
'limit to path should show nothing' \
|
|
'git-diff-cache --cached $tree path >current &&
|
|
compare_diff_raw current expected'
|
|
|
|
cat >expected <<\EOF
|
|
:100644 100644 766498d93a4b06057a8e49d23f4068f1170ff38f 0a41e115ab61be0328a19b29f18cdcb49338d516 M path1/file1
|
|
EOF
|
|
test_expect_success \
|
|
'limit to path1 should show path1/file1' \
|
|
'git-diff-cache --cached $tree path1 >current &&
|
|
compare_diff_raw current expected'
|
|
|
|
cat >expected <<\EOF
|
|
:100644 100644 766498d93a4b06057a8e49d23f4068f1170ff38f 0a41e115ab61be0328a19b29f18cdcb49338d516 M path1/file1
|
|
EOF
|
|
test_expect_success \
|
|
'limit to path1/ should show path1/file1' \
|
|
'git-diff-cache --cached $tree path1/ >current &&
|
|
compare_diff_raw current expected'
|
|
|
|
cat >expected <<\EOF
|
|
:100644 100644 766498d93a4b06057a8e49d23f4068f1170ff38f 0a41e115ab61be0328a19b29f18cdcb49338d516 M file0
|
|
EOF
|
|
test_expect_success \
|
|
'limit to file0 should show file0' \
|
|
'git-diff-cache --cached $tree file0 >current &&
|
|
compare_diff_raw current expected'
|
|
|
|
cat >expected <<\EOF
|
|
EOF
|
|
test_expect_success \
|
|
'limit to file0/ should emit nothing.' \
|
|
'git-diff-cache --cached $tree file0/ >current &&
|
|
compare_diff_raw current expected'
|
|
|
|
test_done
|