diff options
| author | Johannes Sixt <j6t@kdbg.org> | 2013-06-07 20:53:28 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-07 22:01:45 (GMT) |
| commit | 889c6f0e4d637223e0517d000eedad39b173d8a2 (patch) | |
| tree | d21550794a99df816ecc0a580d14545ee5c12acf /t/t4030-diff-textconv.sh | |
| parent | 9ce415d972a04df4bfceaad0fab8eaea9a66997e (diff) | |
| download | git-889c6f0e4d637223e0517d000eedad39b173d8a2.zip git-889c6f0e4d637223e0517d000eedad39b173d8a2.tar.gz git-889c6f0e4d637223e0517d000eedad39b173d8a2.tar.bz2 | |
tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases)
There are many instances where the treatment of symbolic links in the
object model and the algorithms are tested, but where it is not
necessary to actually have a symbolic link in the worktree. Make
adjustments to the tests and remove the SYMLINKS prerequisite when
appropriate in trivial cases, where "trivial" means:
- merely a replacement of 'ln -s a b && git add b' by test_ln_s_add
is needed;
- a test for symbolic link on the file system can be split off (and
remains protected by SYMLINKS);
- existing code is equivalent to test_ln_s_add.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4030-diff-textconv.sh')
| -rwxr-xr-x | t/t4030-diff-textconv.sh | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/t/t4030-diff-textconv.sh b/t/t4030-diff-textconv.sh index 53ec330..f75f46f 100755 --- a/t/t4030-diff-textconv.sh +++ b/t/t4030-diff-textconv.sh @@ -139,12 +139,10 @@ index 0000000..67be421 +frotz \ No newline at end of file EOF -# make a symlink the hard way that works on symlink-challenged file systems + test_expect_success 'textconv does not act on symlinks' ' - printf frotz > file && - git add file && - git ls-files -s | sed -e s/100644/120000/ | - git update-index --index-info && + rm -f file && + test_ln_s_add frotz file && git commit -m typechange && git show >diff && find_diff <diff >actual && |