diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-08-19 01:48:03 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-22 06:04:25 (GMT) |
| commit | c51c0da2225d65ec1984d40bacbc3f43a0bfa178 (patch) | |
| tree | 68ca4c6ddbc9701e1fc0b88e95b1c02695f05794 /t/t4135/diff-with spaces.diff | |
| parent | bb7306b5a350fd2143347be3d9b7d8588567d715 (diff) | |
| download | git-c51c0da2225d65ec1984d40bacbc3f43a0bfa178.zip git-c51c0da2225d65ec1984d40bacbc3f43a0bfa178.tar.gz git-c51c0da2225d65ec1984d40bacbc3f43a0bfa178.tar.bz2 | |
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>
Diffstat (limited to 't/t4135/diff-with spaces.diff')
| -rw-r--r-- | t/t4135/diff-with spaces.diff | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/t/t4135/diff-with spaces.diff b/t/t4135/diff-with spaces.diff new file mode 100644 index 0000000..3512056 --- /dev/null +++ b/t/t4135/diff-with spaces.diff @@ -0,0 +1,5 @@ +--- post image.txt.orig 2010-08-18 20:13:31.544002255 -0500 ++++ post image.txt 2010-08-18 20:13:31.544002255 -0500 +@@ -1 +1 @@ +-preimage ++postimage |