1 % make a combination of new, changed and deleted file |
|
2 adding binary |
|
3 adding exec |
|
4 adding regular |
|
5 adding rmbinary |
|
6 adding rmempty |
|
7 adding rmexec |
|
8 adding rmregular |
|
9 adding setexec |
|
10 adding unsetexec |
|
11 adding newbinary |
|
12 adding newempty |
|
13 adding newexec |
|
14 adding newregular |
|
15 removing rmbinary |
|
16 removing rmempty |
|
17 removing rmexec |
|
18 removing rmregular |
|
19 % git=no: regular diff for all files |
|
20 diff -r b3f053cd7c7f binary |
|
21 Binary file binary has changed |
|
22 diff -r b3f053cd7c7f exec |
|
23 --- a/exec |
|
24 +++ b/exec |
|
25 @@ -1,1 +1,2 @@ |
|
26 exec |
|
27 +exec |
|
28 diff -r b3f053cd7c7f newbinary |
|
29 Binary file newbinary has changed |
|
30 diff -r b3f053cd7c7f newexec |
|
31 --- /dev/null |
|
32 +++ b/newexec |
|
33 @@ -0,0 +1,1 @@ |
|
34 +newexec |
|
35 diff -r b3f053cd7c7f newregular |
|
36 --- /dev/null |
|
37 +++ b/newregular |
|
38 @@ -0,0 +1,1 @@ |
|
39 +newregular |
|
40 diff -r b3f053cd7c7f regular |
|
41 --- a/regular |
|
42 +++ b/regular |
|
43 @@ -1,1 +1,2 @@ |
|
44 regular |
|
45 +regular |
|
46 diff -r b3f053cd7c7f rmbinary |
|
47 Binary file rmbinary has changed |
|
48 diff -r b3f053cd7c7f rmexec |
|
49 --- a/rmexec |
|
50 +++ /dev/null |
|
51 @@ -1,1 +0,0 @@ |
|
52 -rmexec |
|
53 diff -r b3f053cd7c7f rmregular |
|
54 --- a/rmregular |
|
55 +++ /dev/null |
|
56 @@ -1,1 +0,0 @@ |
|
57 -rmregular |
|
58 % git=no: git diff for single regular file |
|
59 diff --git a/regular b/regular |
|
60 --- a/regular |
|
61 +++ b/regular |
|
62 @@ -1,1 +1,2 @@ |
|
63 regular |
|
64 +regular |
|
65 % git=auto: regular diff for regular files and removals |
|
66 diff -r b3f053cd7c7f newregular |
|
67 --- /dev/null |
|
68 +++ b/newregular |
|
69 @@ -0,0 +1,1 @@ |
|
70 +newregular |
|
71 diff -r b3f053cd7c7f regular |
|
72 --- a/regular |
|
73 +++ b/regular |
|
74 @@ -1,1 +1,2 @@ |
|
75 regular |
|
76 +regular |
|
77 diff -r b3f053cd7c7f rmbinary |
|
78 Binary file rmbinary has changed |
|
79 diff -r b3f053cd7c7f rmexec |
|
80 --- a/rmexec |
|
81 +++ /dev/null |
|
82 @@ -1,1 +0,0 @@ |
|
83 -rmexec |
|
84 diff -r b3f053cd7c7f rmregular |
|
85 --- a/rmregular |
|
86 +++ /dev/null |
|
87 @@ -1,1 +0,0 @@ |
|
88 -rmregular |
|
89 % git=auto: git diff for exec |
|
90 diff -r b3f053cd7c7f exec |
|
91 --- a/exec |
|
92 +++ b/exec |
|
93 @@ -1,1 +1,2 @@ |
|
94 exec |
|
95 +exec |
|
96 % git=auto: git diff for newexec |
|
97 diff --git a/newexec b/newexec |
|
98 new file mode 100755 |
|
99 --- /dev/null |
|
100 +++ b/newexec |
|
101 @@ -0,0 +1,1 @@ |
|
102 +newexec |
|
103 % git=auto: git diff for setexec |
|
104 diff --git a/setexec b/setexec |
|
105 old mode 100644 |
|
106 new mode 100755 |
|
107 % git=auto: git diff for unsetexec |
|
108 diff --git a/unsetexec b/unsetexec |
|
109 old mode 100755 |
|
110 new mode 100644 |
|
111 % git=auto: git diff for binary |
|
112 diff --git a/binary b/binary |
|
113 index a9128c283485202893f5af379dd9beccb6e79486..09f370e38f498a462e1ca0faa724559b6630c04f |
|
114 GIT binary patch |
|
115 literal 2 |
|
116 Jc${Nk0000200961 |
|
117 |
|
118 % git=auto: git diff for newbinary |
|
119 diff --git a/newbinary b/newbinary |
|
120 new file mode 100644 |
|
121 index 0000000000000000000000000000000000000000..f76dd238ade08917e6712764a16a22005a50573d |
|
122 GIT binary patch |
|
123 literal 1 |
|
124 Ic${MZ000310RR91 |
|
125 |
|
126 % git=auto: git diff for newempty |
|
127 diff --git a/newempty b/newempty |
|
128 new file mode 100644 |
|
129 % git=auto: git diff for rmempty |
|
130 diff --git a/rmempty b/rmempty |
|
131 deleted file mode 100644 |
|
132 % git=warn: regular diff with data loss warnings |
|
133 diff -r b3f053cd7c7f binary |
|
134 Binary file binary has changed |
|
135 diff -r b3f053cd7c7f exec |
|
136 --- a/exec |
|
137 +++ b/exec |
|
138 @@ -1,1 +1,2 @@ |
|
139 exec |
|
140 +exec |
|
141 diff -r b3f053cd7c7f newbinary |
|
142 Binary file newbinary has changed |
|
143 diff -r b3f053cd7c7f newexec |
|
144 --- /dev/null |
|
145 +++ b/newexec |
|
146 @@ -0,0 +1,1 @@ |
|
147 +newexec |
|
148 diff -r b3f053cd7c7f newregular |
|
149 --- /dev/null |
|
150 +++ b/newregular |
|
151 @@ -0,0 +1,1 @@ |
|
152 +newregular |
|
153 diff -r b3f053cd7c7f regular |
|
154 --- a/regular |
|
155 +++ b/regular |
|
156 @@ -1,1 +1,2 @@ |
|
157 regular |
|
158 +regular |
|
159 diff -r b3f053cd7c7f rmbinary |
|
160 Binary file rmbinary has changed |
|
161 diff -r b3f053cd7c7f rmexec |
|
162 --- a/rmexec |
|
163 +++ /dev/null |
|
164 @@ -1,1 +0,0 @@ |
|
165 -rmexec |
|
166 diff -r b3f053cd7c7f rmregular |
|
167 --- a/rmregular |
|
168 +++ /dev/null |
|
169 @@ -1,1 +0,0 @@ |
|
170 -rmregular |
|
171 data lost for: binary |
|
172 data lost for: newbinary |
|
173 data lost for: newempty |
|
174 data lost for: newexec |
|
175 data lost for: rmempty |
|
176 data lost for: setexec |
|
177 data lost for: unsetexec |
|
178 % git=abort: fail on execute bit change |
|
179 abort: losing data for setexec |
|
180 % git=abort: succeed on regular file |
|
181 diff -r b3f053cd7c7f regular |
|
182 --- a/regular |
|
183 +++ b/regular |
|
184 @@ -1,1 +1,2 @@ |
|
185 regular |
|
186 +regular |
|