diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-26 01:20:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-26 01:20:42 -0800 |
| commit | 048f48a2fdefdf71e7af19ec7111000ce2ebf52e (patch) | |
| tree | ee91b56c9071972b1585fa65838da5748c0abfd9 /t/t4016-diff-quote.sh | |
| parent | 646b3299613f0dd947557bc965660986d024322b (diff) | |
| parent | c260d790c85c07a5f50235f664c36725deedfb10 (diff) | |
| download | git-048f48a2fdefdf71e7af19ec7111000ce2ebf52e.tar.gz | |
Merge branch 'master' into js/diff-ni
* master: (201 commits)
Documentation: link in 1.5.0.2 material to the top documentation page.
Documentation: document remote.<name>.tagopt
GIT 1.5.0.2
git-remote: support remotes with a dot in the name
Documentation: describe "-f/-t/-m" options to "git-remote add"
diff --cc: fix display of symlink conflicts during a merge.
merge-recursive: fix longstanding bug in merging symlinks
merge-index: fix longstanding bug in merging symlinks
diff --cached: give more sensible error message when HEAD is yet to be created.
Update tests to use test-chmtime
Add test-chmtime: a utility to change mtime on files
Add Release Notes to prepare for 1.5.0.2
Allow arbitrary number of arguments to git-pack-objects
rerere: do not deal with symlinks.
rerere: do not skip two conflicted paths next to each other.
Don't modify CREDITS-FILE if it hasn't changed.
diff-patch: Avoid emitting double-slashes in textual patch.
Reword git-am 3-way fallback failure message.
Limit filename for format-patch
core.legacyheaders: Use the description used in RelNotes-1.5.0
...
Diffstat (limited to 't/t4016-diff-quote.sh')
| -rwxr-xr-x | t/t4016-diff-quote.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/t/t4016-diff-quote.sh b/t/t4016-diff-quote.sh index edde8f5568..2e7cd5f255 100755 --- a/t/t4016-diff-quote.sh +++ b/t/t4016-diff-quote.sh @@ -13,6 +13,10 @@ P1='pathname with HT' P2='pathname with SP' P3='pathname with LF' +: >"$P1" 2>&1 && test -f "$P1" && rm -f "$P1" || { + echo >&2 'Filesystem does not support tabs in names' + test_done +} test_expect_success setup ' echo P0.0 >"$P0.0" && |