submodule: Use cat instead of echo to avoid DOS line-endings
[git/dscho.git] / t / t4114-apply-typechange.sh
blobf12826fb09729d5753f3f6c9511dab5062f0aae1
1 #!/bin/sh
3 # Copyright (c) 2006 Eric Wong
6 test_description='git apply should not get confused with type changes.
10 . ./test-lib.sh
12 test_expect_success SYMLINKS 'setup repository and commits' '
13 echo "hello world" > foo &&
14 echo "hi planet" > bar &&
15 git update-index --add foo bar &&
16 git commit -m initial &&
17 git branch initial &&
18 rm -f foo &&
19 ln -s bar foo &&
20 git update-index foo &&
21 git commit -m "foo symlinked to bar" &&
22 git branch foo-symlinked-to-bar &&
23 rm -f foo &&
24 echo "how far is the sun?" > foo &&
25 git update-index foo &&
26 git commit -m "foo back to file" &&
27 git branch foo-back-to-file &&
28 printf "\0" > foo &&
29 git update-index foo &&
30 git commit -m "foo becomes binary" &&
31 git branch foo-becomes-binary &&
32 rm -f foo &&
33 git update-index --remove foo &&
34 mkdir foo &&
35 echo "if only I knew" > foo/baz &&
36 git update-index --add foo/baz &&
37 git commit -m "foo becomes a directory" &&
38 git branch "foo-becomes-a-directory" &&
39 echo "hello world" > foo/baz &&
40 git update-index foo/baz &&
41 git commit -m "foo/baz is the original foo" &&
42 git branch foo-baz-renamed-from-foo
45 test_expect_success SYMLINKS 'file renamed from foo to foo/baz' '
46 git checkout -f initial &&
47 git diff-tree -M -p HEAD foo-baz-renamed-from-foo > patch &&
48 git apply --index < patch
50 test_debug 'cat patch'
53 test_expect_success SYMLINKS 'file renamed from foo/baz to foo' '
54 git checkout -f foo-baz-renamed-from-foo &&
55 git diff-tree -M -p HEAD initial > patch &&
56 git apply --index < patch
58 test_debug 'cat patch'
61 test_expect_success SYMLINKS 'directory becomes file' '
62 git checkout -f foo-becomes-a-directory &&
63 git diff-tree -p HEAD initial > patch &&
64 git apply --index < patch
66 test_debug 'cat patch'
69 test_expect_success SYMLINKS 'file becomes directory' '
70 git checkout -f initial &&
71 git diff-tree -p HEAD foo-becomes-a-directory > patch &&
72 git apply --index < patch
74 test_debug 'cat patch'
77 test_expect_success SYMLINKS 'file becomes symlink' '
78 git checkout -f initial &&
79 git diff-tree -p HEAD foo-symlinked-to-bar > patch &&
80 git apply --index < patch
82 test_debug 'cat patch'
85 test_expect_success SYMLINKS 'symlink becomes file' '
86 git checkout -f foo-symlinked-to-bar &&
87 git diff-tree -p HEAD foo-back-to-file > patch &&
88 git apply --index < patch
90 test_debug 'cat patch'
92 test_expect_success SYMLINKS 'binary file becomes symlink' '
93 git checkout -f foo-becomes-binary &&
94 git diff-tree -p --binary HEAD foo-symlinked-to-bar > patch &&
95 git apply --index < patch
97 test_debug 'cat patch'
99 test_expect_success SYMLINKS 'symlink becomes binary file' '
100 git checkout -f foo-symlinked-to-bar &&
101 git diff-tree -p --binary HEAD foo-becomes-binary > patch &&
102 git apply --index < patch
104 test_debug 'cat patch'
107 test_expect_success SYMLINKS 'symlink becomes directory' '
108 git checkout -f foo-symlinked-to-bar &&
109 git diff-tree -p HEAD foo-becomes-a-directory > patch &&
110 git apply --index < patch
112 test_debug 'cat patch'
115 test_expect_success SYMLINKS 'directory becomes symlink' '
116 git checkout -f foo-becomes-a-directory &&
117 git diff-tree -p HEAD foo-symlinked-to-bar > patch &&
118 git apply --index < patch
120 test_debug 'cat patch'
123 test_done