tests: exercise "git apply" with weird filenames
Check that "git apply" can cope with strange filenames, particularly
filenames with spaces.
Not all platforms have a sane enough diff -u and expand to
reliably create the such patches and maybe future versions of GNU
diff will handle funny characters differently, so this uses
pre-generated patches. The script used to generate them is in
t/t4135/make-patches.
Filenames with tabs are not usable on NTFS; use something like the
FUNNYNAMES prerequisite from v1.3.0-rc1~67 (2006-03-03) to skip the
relevant tests when appropriate. The detection is not shared in
test-lib.sh to avoid wasting time while running other test scripts.
Backslash is the path separator on Windows, so do not used it in
file names there (v1.6.3-rc0~93^2~6, 2009-03-13).
Finally, filenames starting with a quotation mark do not behave well
in msys (see v1.7.0-rc0~94^2, t4030, t4031: work around bogus MSYS
bash path conversion, 2010-01-01), so skip those tests on Windows,
too.
Helped-by: Andreas Schwab <schwab@linux-m68k.org>
Helped-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-08-19 01:48:03 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='git apply with weird postimage filenames'
|
|
|
|
|
2022-11-08 18:17:39 +00:00
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
tests: exercise "git apply" with weird filenames
Check that "git apply" can cope with strange filenames, particularly
filenames with spaces.
Not all platforms have a sane enough diff -u and expand to
reliably create the such patches and maybe future versions of GNU
diff will handle funny characters differently, so this uses
pre-generated patches. The script used to generate them is in
t/t4135/make-patches.
Filenames with tabs are not usable on NTFS; use something like the
FUNNYNAMES prerequisite from v1.3.0-rc1~67 (2006-03-03) to skip the
relevant tests when appropriate. The detection is not shared in
test-lib.sh to avoid wasting time while running other test scripts.
Backslash is the path separator on Windows, so do not used it in
file names there (v1.6.3-rc0~93^2~6, 2009-03-13).
Finally, filenames starting with a quotation mark do not behave well
in msys (see v1.7.0-rc0~94^2, t4030, t4031: work around bogus MSYS
bash path conversion, 2010-01-01), so skip those tests on Windows,
too.
Helped-by: Andreas Schwab <schwab@linux-m68k.org>
Helped-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-08-19 01:48:03 +00:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
test_expect_success 'setup' '
|
|
|
|
vector=$TEST_DIRECTORY/t4135 &&
|
|
|
|
|
|
|
|
test_tick &&
|
|
|
|
git commit --allow-empty -m preimage &&
|
|
|
|
git tag preimage &&
|
|
|
|
|
|
|
|
reset_preimage() {
|
|
|
|
git checkout -f preimage^0 &&
|
|
|
|
git read-tree -u --reset HEAD &&
|
|
|
|
git update-index --refresh
|
t: factor out FUNNYNAMES as shared lazy prereq
A fair number of tests need to check that the filesystem supports file
names including "funny" characters, like newline, tab, and double-quote.
Jonathan Nieder suggested that this be extracted into a lazy prereq in
the top-level `test-lib.sh`. This patch effects that change.
The FUNNYNAMES prereq now uniformly requires support for newlines, tabs,
and double-quotes in filenames. This very slightly decreases the power
of some tests, which might have run previously on a system that supports
(e.g.) newlines and tabs but not double-quotes, but now will not. This
seems to me like an acceptable tradeoff for consistency.
One test (`t/t9902-completion.sh`) defined FUNNYNAMES to further require
the separators \034 through \037, the test for which was implemented
using the Bash-specific $'\034' syntax. I've elected to leave this one
as is, renaming it to FUNNIERNAMES.
After this patch, `git grep 'test_\(set\|lazy\)_prereq.*FUNNYNAMES'` has
only one result.
Signed-off-by: William Chargin <wchargin@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-06 18:35:08 +00:00
|
|
|
}
|
tests: exercise "git apply" with weird filenames
Check that "git apply" can cope with strange filenames, particularly
filenames with spaces.
Not all platforms have a sane enough diff -u and expand to
reliably create the such patches and maybe future versions of GNU
diff will handle funny characters differently, so this uses
pre-generated patches. The script used to generate them is in
t/t4135/make-patches.
Filenames with tabs are not usable on NTFS; use something like the
FUNNYNAMES prerequisite from v1.3.0-rc1~67 (2006-03-03) to skip the
relevant tests when appropriate. The detection is not shared in
test-lib.sh to avoid wasting time while running other test scripts.
Backslash is the path separator on Windows, so do not used it in
file names there (v1.6.3-rc0~93^2~6, 2009-03-13).
Finally, filenames starting with a quotation mark do not behave well
in msys (see v1.7.0-rc0~94^2, t4030, t4031: work around bogus MSYS
bash path conversion, 2010-01-01), so skip those tests on Windows,
too.
Helped-by: Andreas Schwab <schwab@linux-m68k.org>
Helped-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-08-19 01:48:03 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
try_filename() {
|
|
|
|
desc=$1
|
|
|
|
postimage=$2
|
|
|
|
prereq=${3:-}
|
|
|
|
exp1=${4:-success}
|
|
|
|
exp2=${5:-success}
|
|
|
|
exp3=${6:-success}
|
|
|
|
|
|
|
|
test_expect_$exp1 $prereq "$desc, git-style file creation patch" "
|
|
|
|
echo postimage >expected &&
|
|
|
|
reset_preimage &&
|
|
|
|
rm -f '$postimage' &&
|
|
|
|
git apply -v \"\$vector\"/'git-$desc.diff' &&
|
|
|
|
test_cmp expected '$postimage'
|
|
|
|
"
|
|
|
|
|
|
|
|
test_expect_$exp2 $prereq "$desc, traditional patch" "
|
|
|
|
echo postimage >expected &&
|
|
|
|
reset_preimage &&
|
|
|
|
echo preimage >'$postimage' &&
|
|
|
|
git apply -v \"\$vector\"/'diff-$desc.diff' &&
|
|
|
|
test_cmp expected '$postimage'
|
|
|
|
"
|
|
|
|
|
|
|
|
test_expect_$exp3 $prereq "$desc, traditional file creation patch" "
|
|
|
|
echo postimage >expected &&
|
|
|
|
reset_preimage &&
|
|
|
|
rm -f '$postimage' &&
|
|
|
|
git apply -v \"\$vector\"/'add-$desc.diff' &&
|
|
|
|
test_cmp expected '$postimage'
|
|
|
|
"
|
|
|
|
}
|
|
|
|
|
|
|
|
try_filename 'plain' 'postimage.txt'
|
2010-08-19 01:50:14 +00:00
|
|
|
try_filename 'with spaces' 'post image.txt'
|
|
|
|
try_filename 'with tab' 'post image.txt' FUNNYNAMES
|
tests: exercise "git apply" with weird filenames
Check that "git apply" can cope with strange filenames, particularly
filenames with spaces.
Not all platforms have a sane enough diff -u and expand to
reliably create the such patches and maybe future versions of GNU
diff will handle funny characters differently, so this uses
pre-generated patches. The script used to generate them is in
t/t4135/make-patches.
Filenames with tabs are not usable on NTFS; use something like the
FUNNYNAMES prerequisite from v1.3.0-rc1~67 (2006-03-03) to skip the
relevant tests when appropriate. The detection is not shared in
test-lib.sh to avoid wasting time while running other test scripts.
Backslash is the path separator on Windows, so do not used it in
file names there (v1.6.3-rc0~93^2~6, 2009-03-13).
Finally, filenames starting with a quotation mark do not behave well
in msys (see v1.7.0-rc0~94^2, t4030, t4031: work around bogus MSYS
bash path conversion, 2010-01-01), so skip those tests on Windows,
too.
Helped-by: Andreas Schwab <schwab@linux-m68k.org>
Helped-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-08-19 01:48:03 +00:00
|
|
|
try_filename 'with backslash' 'post\image.txt' BSLASHPSPEC
|
|
|
|
try_filename 'with quote' '"postimage".txt' FUNNYNAMES success failure success
|
|
|
|
|
|
|
|
test_expect_success 'whitespace-damaged traditional patch' '
|
|
|
|
echo postimage >expected &&
|
|
|
|
reset_preimage &&
|
|
|
|
rm -f postimage.txt &&
|
|
|
|
git apply -v "$vector/damaged.diff" &&
|
|
|
|
test_cmp expected postimage.txt
|
|
|
|
'
|
|
|
|
|
2010-09-29 21:41:08 +00:00
|
|
|
test_expect_success 'traditional patch with colon in timezone' '
|
|
|
|
echo postimage >expected &&
|
|
|
|
reset_preimage &&
|
|
|
|
rm -f "post image.txt" &&
|
|
|
|
git apply "$vector/funny-tz.diff" &&
|
|
|
|
test_cmp expected "post image.txt"
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'traditional, whitespace-damaged, colon in timezone' '
|
|
|
|
echo postimage >expected &&
|
|
|
|
reset_preimage &&
|
|
|
|
rm -f "post image.txt" &&
|
|
|
|
git apply "$vector/damaged-tz.diff" &&
|
|
|
|
test_cmp expected "post image.txt"
|
|
|
|
'
|
|
|
|
|
2018-02-15 00:29:27 +00:00
|
|
|
cat >diff-from-svn <<\EOF
|
|
|
|
Index: Makefile
|
|
|
|
===================================================================
|
|
|
|
diff --git a/branches/Makefile
|
|
|
|
deleted file mode 100644
|
|
|
|
--- a/branches/Makefile (revision 13)
|
|
|
|
+++ /dev/null (nonexistent)
|
|
|
|
@@ +1 0,0 @@
|
|
|
|
-
|
|
|
|
EOF
|
|
|
|
|
2018-02-15 00:29:34 +00:00
|
|
|
test_expect_success 'apply handles a diff generated by Subversion' '
|
2018-02-15 00:29:27 +00:00
|
|
|
>Makefile &&
|
|
|
|
git apply -p2 diff-from-svn &&
|
|
|
|
test_path_is_missing Makefile
|
|
|
|
'
|
|
|
|
|
tests: exercise "git apply" with weird filenames
Check that "git apply" can cope with strange filenames, particularly
filenames with spaces.
Not all platforms have a sane enough diff -u and expand to
reliably create the such patches and maybe future versions of GNU
diff will handle funny characters differently, so this uses
pre-generated patches. The script used to generate them is in
t/t4135/make-patches.
Filenames with tabs are not usable on NTFS; use something like the
FUNNYNAMES prerequisite from v1.3.0-rc1~67 (2006-03-03) to skip the
relevant tests when appropriate. The detection is not shared in
test-lib.sh to avoid wasting time while running other test scripts.
Backslash is the path separator on Windows, so do not used it in
file names there (v1.6.3-rc0~93^2~6, 2009-03-13).
Finally, filenames starting with a quotation mark do not behave well
in msys (see v1.7.0-rc0~94^2, t4030, t4031: work around bogus MSYS
bash path conversion, 2010-01-01), so skip those tests on Windows,
too.
Helped-by: Andreas Schwab <schwab@linux-m68k.org>
Helped-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-08-19 01:48:03 +00:00
|
|
|
test_done
|