7f814632f5
"git diff --stat" and "git apply --stat" now learn to print the line "%d files changed, %d insertions(+), %d deletions(-)" in singular form whenever applicable. "0 insertions" and "0 deletions" are also omitted unless they are both zero. This matches how versions of "diffstat" that are not prehistoric produced their output, and also makes this line translatable. [jc: with help from Thomas Dickey in archaeology of "diffstat"] [jc: squashed Jonathan's updates to illustrations in tutorials and a test] Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
199 lines
5.1 KiB
Bash
Executable File
199 lines
5.1 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
#
|
|
|
|
test_description='Pathnames with funny characters.
|
|
|
|
This test tries pathnames with funny characters in the working
|
|
tree, index, and tree objects.
|
|
'
|
|
|
|
. ./test-lib.sh
|
|
|
|
p0='no-funny'
|
|
p1='tabs ," (dq) and spaces'
|
|
p2='just space'
|
|
|
|
cat >"$p0" <<\EOF
|
|
1. A quick brown fox jumps over the lazy cat, oops dog.
|
|
2. A quick brown fox jumps over the lazy cat, oops dog.
|
|
3. A quick brown fox jumps over the lazy cat, oops dog.
|
|
EOF
|
|
|
|
cat 2>/dev/null >"$p1" "$p0"
|
|
echo 'Foo Bar Baz' >"$p2"
|
|
|
|
if test -f "$p1" && cmp "$p0" "$p1"
|
|
then
|
|
test_set_prereq TABS_IN_FILENAMES
|
|
else
|
|
# since FAT/NTFS does not allow tabs in filenames, skip this test
|
|
say 'Your filesystem does not allow tabs in filenames'
|
|
fi
|
|
|
|
test_expect_success TABS_IN_FILENAMES 'setup expect' "
|
|
echo 'just space
|
|
no-funny' >expected
|
|
"
|
|
|
|
test_expect_success TABS_IN_FILENAMES 'git ls-files no-funny' \
|
|
'git update-index --add "$p0" "$p2" &&
|
|
git ls-files >current &&
|
|
test_cmp expected current'
|
|
|
|
test_expect_success TABS_IN_FILENAMES 'setup expect' '
|
|
t0=`git write-tree` &&
|
|
echo "$t0" >t0 &&
|
|
|
|
cat > expected <<\EOF
|
|
just space
|
|
no-funny
|
|
"tabs\t,\" (dq) and spaces"
|
|
EOF
|
|
'
|
|
|
|
test_expect_success TABS_IN_FILENAMES 'git ls-files with-funny' \
|
|
'git update-index --add "$p1" &&
|
|
git ls-files >current &&
|
|
test_cmp expected current'
|
|
|
|
test_expect_success TABS_IN_FILENAMES 'setup expect' "
|
|
echo 'just space
|
|
no-funny
|
|
tabs ,\" (dq) and spaces' >expected
|
|
"
|
|
|
|
test_expect_success TABS_IN_FILENAMES 'git ls-files -z with-funny' \
|
|
'git ls-files -z | perl -pe y/\\000/\\012/ >current &&
|
|
test_cmp expected current'
|
|
|
|
test_expect_success TABS_IN_FILENAMES 'setup expect' '
|
|
t1=`git write-tree` &&
|
|
echo "$t1" >t1 &&
|
|
|
|
cat > expected <<\EOF
|
|
just space
|
|
no-funny
|
|
"tabs\t,\" (dq) and spaces"
|
|
EOF
|
|
'
|
|
|
|
test_expect_success TABS_IN_FILENAMES 'git ls-tree with funny' \
|
|
'git ls-tree -r $t1 | sed -e "s/^[^ ]* //" >current &&
|
|
test_cmp expected current'
|
|
|
|
test_expect_success TABS_IN_FILENAMES 'setup expect' '
|
|
cat > expected <<\EOF
|
|
A "tabs\t,\" (dq) and spaces"
|
|
EOF
|
|
'
|
|
|
|
test_expect_success TABS_IN_FILENAMES 'git diff-index with-funny' \
|
|
'git diff-index --name-status $t0 >current &&
|
|
test_cmp expected current'
|
|
|
|
test_expect_success TABS_IN_FILENAMES 'git diff-tree with-funny' \
|
|
'git diff-tree --name-status $t0 $t1 >current &&
|
|
test_cmp expected current'
|
|
|
|
test_expect_success TABS_IN_FILENAMES 'setup expect' "
|
|
echo 'A
|
|
tabs ,\" (dq) and spaces' >expected
|
|
"
|
|
|
|
test_expect_success TABS_IN_FILENAMES 'git diff-index -z with-funny' \
|
|
'git diff-index -z --name-status $t0 | perl -pe y/\\000/\\012/ >current &&
|
|
test_cmp expected current'
|
|
|
|
test_expect_success TABS_IN_FILENAMES 'git diff-tree -z with-funny' \
|
|
'git diff-tree -z --name-status $t0 $t1 | perl -pe y/\\000/\\012/ >current &&
|
|
test_cmp expected current'
|
|
|
|
test_expect_success TABS_IN_FILENAMES 'setup expect' '
|
|
cat > expected <<\EOF
|
|
CNUM no-funny "tabs\t,\" (dq) and spaces"
|
|
EOF
|
|
'
|
|
|
|
test_expect_success TABS_IN_FILENAMES 'git diff-tree -C with-funny' \
|
|
'git diff-tree -C --find-copies-harder --name-status \
|
|
$t0 $t1 | sed -e 's/^C[0-9]*/CNUM/' >current &&
|
|
test_cmp expected current'
|
|
|
|
test_expect_success TABS_IN_FILENAMES 'setup expect' '
|
|
cat > expected <<\EOF
|
|
RNUM no-funny "tabs\t,\" (dq) and spaces"
|
|
EOF
|
|
'
|
|
|
|
test_expect_success TABS_IN_FILENAMES 'git diff-tree delete with-funny' \
|
|
'git update-index --force-remove "$p0" &&
|
|
git diff-index -M --name-status \
|
|
$t0 | sed -e 's/^R[0-9]*/RNUM/' >current &&
|
|
test_cmp expected current'
|
|
|
|
test_expect_success TABS_IN_FILENAMES 'setup expect' '
|
|
cat > expected <<\EOF
|
|
diff --git a/no-funny "b/tabs\t,\" (dq) and spaces"
|
|
similarity index NUM%
|
|
rename from no-funny
|
|
rename to "tabs\t,\" (dq) and spaces"
|
|
EOF
|
|
'
|
|
|
|
test_expect_success TABS_IN_FILENAMES 'git diff-tree delete with-funny' \
|
|
'git diff-index -M -p $t0 |
|
|
sed -e "s/index [0-9]*%/index NUM%/" >current &&
|
|
test_cmp expected current'
|
|
|
|
test_expect_success TABS_IN_FILENAMES 'setup expect' '
|
|
chmod +x "$p1" &&
|
|
cat > expected <<\EOF
|
|
diff --git a/no-funny "b/tabs\t,\" (dq) and spaces"
|
|
old mode 100644
|
|
new mode 100755
|
|
similarity index NUM%
|
|
rename from no-funny
|
|
rename to "tabs\t,\" (dq) and spaces"
|
|
EOF
|
|
'
|
|
|
|
test_expect_success TABS_IN_FILENAMES 'git diff-tree delete with-funny' \
|
|
'git diff-index -M -p $t0 |
|
|
sed -e "s/index [0-9]*%/index NUM%/" >current &&
|
|
test_cmp expected current'
|
|
|
|
test_expect_success TABS_IN_FILENAMES 'setup expect' '
|
|
cat >expected <<\EOF
|
|
"tabs\t,\" (dq) and spaces"
|
|
1 file changed, 0 insertions(+), 0 deletions(-)
|
|
EOF
|
|
'
|
|
|
|
test_expect_success TABS_IN_FILENAMES 'git diff-tree rename with-funny applied' \
|
|
'git diff-index -M -p $t0 |
|
|
git apply --stat | sed -e "s/|.*//" -e "s/ *\$//" >current &&
|
|
test_cmp expected current'
|
|
|
|
test_expect_success TABS_IN_FILENAMES 'setup expect' '
|
|
cat > expected <<\EOF
|
|
no-funny
|
|
"tabs\t,\" (dq) and spaces"
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
EOF
|
|
'
|
|
|
|
test_expect_success TABS_IN_FILENAMES 'git diff-tree delete with-funny applied' \
|
|
'git diff-index -p $t0 |
|
|
git apply --stat | sed -e "s/|.*//" -e "s/ *\$//" >current &&
|
|
test_cmp expected current'
|
|
|
|
test_expect_success TABS_IN_FILENAMES 'git apply non-git diff' \
|
|
'git diff-index -p $t0 |
|
|
sed -ne "/^[-+@]/p" |
|
|
git apply --stat | sed -e "s/|.*//" -e "s/ *\$//" >current &&
|
|
test_cmp expected current'
|
|
|
|
test_done
|