802e0ba01d62c66071dbcad7c8df21f8ba09cb13
1 #!/bin/sh
2 #
3 # Copyright (c) 2006 Junio C Hamano
4 #
6 test_description='Various diff formatting options'
8 . ./test-lib.sh
10 test_expect_success setup '
12 GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" &&
13 GIT_COMMITTER_DATE="2006-06-26 00:00:00 +0000" &&
14 export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
16 mkdir dir &&
17 for i in 1 2 3; do echo $i; done >file0 &&
18 for i in A B; do echo $i; done >dir/sub &&
19 cat file0 >file2 &&
20 git add file0 file2 dir/sub &&
21 git commit -m Initial &&
23 git branch initial &&
24 git branch side &&
26 GIT_AUTHOR_DATE="2006-06-26 00:01:00 +0000" &&
27 GIT_COMMITTER_DATE="2006-06-26 00:01:00 +0000" &&
28 export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
30 for i in 4 5 6; do echo $i; done >>file0 &&
31 for i in C D; do echo $i; done >>dir/sub &&
32 rm -f file2 &&
33 git update-index --remove file0 file2 dir/sub &&
34 git commit -m Second &&
36 GIT_AUTHOR_DATE="2006-06-26 00:02:00 +0000" &&
37 GIT_COMMITTER_DATE="2006-06-26 00:02:00 +0000" &&
38 export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
40 for i in A B C; do echo $i; done >file1 &&
41 git add file1 &&
42 for i in E F; do echo $i; done >>dir/sub &&
43 git update-index dir/sub &&
44 git commit -m Third &&
46 GIT_AUTHOR_DATE="2006-06-26 00:03:00 +0000" &&
47 GIT_COMMITTER_DATE="2006-06-26 00:03:00 +0000" &&
48 export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
50 git checkout side &&
51 for i in A B C; do echo $i; done >>file0 &&
52 for i in 1 2; do echo $i; done >>dir/sub &&
53 cat dir/sub >file3 &&
54 git add file3 &&
55 git update-index file0 dir/sub &&
56 git commit -m Side &&
58 GIT_AUTHOR_DATE="2006-06-26 00:04:00 +0000" &&
59 GIT_COMMITTER_DATE="2006-06-26 00:04:00 +0000" &&
60 export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
62 git checkout master &&
63 git pull -s ours . side &&
65 GIT_AUTHOR_DATE="2006-06-26 00:05:00 +0000" &&
66 GIT_COMMITTER_DATE="2006-06-26 00:05:00 +0000" &&
67 export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
69 for i in A B C; do echo $i; done >>file0 &&
70 for i in 1 2; do echo $i; done >>dir/sub &&
71 git update-index file0 dir/sub &&
73 EDITOR=: VISUAL=: git commit --amend &&
74 git show-branch
75 '
77 : <<\EOF
78 ! [initial] Initial
79 * [master] Merge branch 'side'
80 ! [side] Side
81 ---
82 - [master] Merge branch 'side'
83 *+ [side] Side
84 * [master^] Second
85 +*+ [initial] Initial
86 EOF
88 while read cmd
89 do
90 case "$cmd" in
91 '' | '#'*) continue ;;
92 esac
93 test=`echo "$cmd" | sed -e 's|[/ ][/ ]*|_|g'`
94 cnt=`expr $test_count + 1`
95 pfx=`printf "%04d" $cnt`
96 expect="../t4013/diff.$test"
97 actual="$pfx-diff.$test"
99 test_expect_success "git $cmd" '
100 {
101 echo "\$ git $cmd"
102 git $cmd
103 echo "\$"
104 } >"$actual" &&
105 if test -f "$expect"
106 then
107 diff -u "$expect" "$actual" &&
108 rm -f "$actual"
109 else
110 # this is to help developing new tests.
111 cp "$actual" "$expect"
112 false
113 fi
114 '
115 done <<\EOF
116 diff-tree initial
117 diff-tree -r initial
118 diff-tree -r --abbrev initial
119 diff-tree -r --abbrev=4 initial
120 diff-tree --root initial
121 diff-tree --root --abbrev initial
122 diff-tree --root -r initial
123 diff-tree --root -r --abbrev initial
124 diff-tree --root -r --abbrev=4 initial
125 diff-tree -p initial
126 diff-tree --root -p initial
127 diff-tree --patch-with-stat initial
128 diff-tree --root --patch-with-stat initial
129 diff-tree --patch-with-raw initial
130 diff-tree --root --patch-with-raw initial
132 diff-tree --pretty initial
133 diff-tree --pretty --root initial
134 diff-tree --pretty -p initial
135 diff-tree --pretty --stat initial
136 diff-tree --pretty --summary initial
137 diff-tree --pretty --stat --summary initial
138 diff-tree --pretty --root -p initial
139 diff-tree --pretty --root --stat initial
140 #diff-tree --pretty --root --summary initial
141 diff-tree --pretty --root --stat --summary initial
142 diff-tree --pretty --patch-with-stat initial
143 diff-tree --pretty --root --patch-with-stat initial
144 diff-tree --pretty --patch-with-raw initial
145 diff-tree --pretty --root --patch-with-raw initial
147 diff-tree --pretty=oneline initial
148 diff-tree --pretty=oneline --root initial
149 diff-tree --pretty=oneline -p initial
150 diff-tree --pretty=oneline --root -p initial
151 diff-tree --pretty=oneline --patch-with-stat initial
152 diff-tree --pretty=oneline --root --patch-with-stat initial
153 diff-tree --pretty=oneline --patch-with-raw initial
154 diff-tree --pretty=oneline --root --patch-with-raw initial
156 diff-tree --pretty side
157 diff-tree --pretty -p side
158 diff-tree --pretty --patch-with-stat side
160 diff-tree master
161 diff-tree -p master
162 diff-tree -p -m master
163 diff-tree -c master
164 diff-tree -c --abbrev master
165 diff-tree --cc master
167 log master
168 log -p master
169 log --root master
170 log --root -p master
171 log --patch-with-stat master
172 log --root --patch-with-stat master
173 #log --root --patch-with-stat --summary master
174 log -SF master
176 whatchanged master
177 whatchanged -p master
178 whatchanged --root master
179 whatchanged --root -p master
180 whatchanged --patch-with-stat master
181 whatchanged --root --patch-with-stat master
182 whatchanged --root --patch-with-stat --summary master
183 whatchanged -SF master
185 log --patch-with-stat master -- dir/
186 whatchanged --patch-with-stat master -- dir/
188 show initial
189 show --root initial
190 show side
191 show master
192 show --stat side
193 show --stat --summary side
194 show --patch-with-stat side
195 show --patch-with-raw side
196 show --patch-with-stat --summary side
200 EOF
202 test_done