| blob | aebff23b29915cb0bdc13a433cd1d9f20b5a5b5b |
1 % setup_repo
2 % git config guilt.reusebranch true
3 % guilt push -a
4 Applying patch..modify
5 Patch applied.
6 Applying patch..add
7 Patch applied.
8 Applying patch..remove
9 Patch applied.
10 Applying patch..mode
11 Patch applied.
12 % list_files
13 d .git/patches
14 d .git/patches/master
15 d .git/refs/patches
16 d .git/refs/patches/master
17 f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
18 f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
19 f 71596bf71b72c2717e1aee378aabefbfa19ab7c8 .git/patches/master/status
20 f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
21 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series
22 f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
23 r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/master/modify
24 r 37d588cc39848368810e88332bd03b083f2ce3ac .git/refs/patches/master/add
25 r ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba .git/refs/patches/master/mode
26 r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 .git/refs/patches/master/remove
27 % git for-each-ref
28 ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba commit refs/heads/master
29 37d588cc39848368810e88332bd03b083f2ce3ac commit refs/patches/master/add
30 ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba commit refs/patches/master/mode
31 33633e7a1aa31972f125878baf7807be57b1672d commit refs/patches/master/modify
32 ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 commit refs/patches/master/remove
33 % guilt pop
34 Now at remove.
35 % git for-each-ref
36 ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 commit refs/heads/master
37 37d588cc39848368810e88332bd03b083f2ce3ac commit refs/patches/master/add
38 33633e7a1aa31972f125878baf7807be57b1672d commit refs/patches/master/modify
39 ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 commit refs/patches/master/remove
40 % guilt push
41 Applying patch..mode
42 Patch applied.
43 % git for-each-ref
44 ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba commit refs/heads/master
45 37d588cc39848368810e88332bd03b083f2ce3ac commit refs/patches/master/add
46 ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba commit refs/patches/master/mode
47 33633e7a1aa31972f125878baf7807be57b1672d commit refs/patches/master/modify
48 ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 commit refs/patches/master/remove
49 % guilt pop
50 Now at remove.
51 % git for-each-ref
52 ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 commit refs/heads/master
53 37d588cc39848368810e88332bd03b083f2ce3ac commit refs/patches/master/add
54 33633e7a1aa31972f125878baf7807be57b1672d commit refs/patches/master/modify
55 ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 commit refs/patches/master/remove
56 % guilt pop
57 Now at add.
58 % git for-each-ref
59 37d588cc39848368810e88332bd03b083f2ce3ac commit refs/heads/master
60 37d588cc39848368810e88332bd03b083f2ce3ac commit refs/patches/master/add
61 33633e7a1aa31972f125878baf7807be57b1672d commit refs/patches/master/modify
62 % guilt push
63 Applying patch..remove
64 Patch applied.
65 % git for-each-ref
66 ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 commit refs/heads/master
67 37d588cc39848368810e88332bd03b083f2ce3ac commit refs/patches/master/add
68 33633e7a1aa31972f125878baf7807be57b1672d commit refs/patches/master/modify
69 ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 commit refs/patches/master/remove
70 % guilt pop
71 Now at add.
72 % git for-each-ref
73 37d588cc39848368810e88332bd03b083f2ce3ac commit refs/heads/master
74 37d588cc39848368810e88332bd03b083f2ce3ac commit refs/patches/master/add
75 33633e7a1aa31972f125878baf7807be57b1672d commit refs/patches/master/modify
76 % guilt pop
77 Now at modify.
78 % git for-each-ref
79 33633e7a1aa31972f125878baf7807be57b1672d commit refs/heads/master
80 33633e7a1aa31972f125878baf7807be57b1672d commit refs/patches/master/modify
81 % guilt push
82 Applying patch..add
83 Patch applied.
84 % git for-each-ref
85 37d588cc39848368810e88332bd03b083f2ce3ac commit refs/heads/master
86 37d588cc39848368810e88332bd03b083f2ce3ac commit refs/patches/master/add
87 33633e7a1aa31972f125878baf7807be57b1672d commit refs/patches/master/modify
88 % guilt pop
89 Now at modify.
90 % git for-each-ref
91 33633e7a1aa31972f125878baf7807be57b1672d commit refs/heads/master
92 33633e7a1aa31972f125878baf7807be57b1672d commit refs/patches/master/modify
93 % guilt pop
94 All patches popped.
95 % git for-each-ref
96 d4850419ccc1146c7169f500725ce504b9774ed0 commit refs/heads/master
97 % guilt push
98 Applying patch..modify
99 Patch applied.
100 % git for-each-ref
101 33633e7a1aa31972f125878baf7807be57b1672d commit refs/heads/master
102 33633e7a1aa31972f125878baf7807be57b1672d commit refs/patches/master/modify
103 % guilt pop
104 All patches popped.
105 % git for-each-ref
106 d4850419ccc1146c7169f500725ce504b9774ed0 commit refs/heads/master
107 % guilt pop
108 No patches applied.
109 % git for-each-ref
110 d4850419ccc1146c7169f500725ce504b9774ed0 commit refs/heads/master
111 % guilt push
112 Applying patch..modify
113 Patch applied.
114 % git for-each-ref
115 33633e7a1aa31972f125878baf7807be57b1672d commit refs/heads/master
116 33633e7a1aa31972f125878baf7807be57b1672d commit refs/patches/master/modify
117 % guilt pop
118 All patches popped.
119 % git for-each-ref
120 d4850419ccc1146c7169f500725ce504b9774ed0 commit refs/heads/master
121 % guilt push -a
122 Applying patch..modify
123 Patch applied.
124 Applying patch..add
125 Patch applied.
126 Applying patch..remove
127 Patch applied.
128 Applying patch..mode
129 Patch applied.
130 % git for-each-ref
131 ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba commit refs/heads/master
132 37d588cc39848368810e88332bd03b083f2ce3ac commit refs/patches/master/add
133 ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba commit refs/patches/master/mode
134 33633e7a1aa31972f125878baf7807be57b1672d commit refs/patches/master/modify
135 ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 commit refs/patches/master/remove
136 % guilt pop -a
137 All patches popped.
138 % git for-each-ref
139 d4850419ccc1146c7169f500725ce504b9774ed0 commit refs/heads/master
140 % guilt push add
141 Applying patch..modify
142 Patch applied.
143 Applying patch..add
144 Patch applied.
145 % git for-each-ref
146 37d588cc39848368810e88332bd03b083f2ce3ac commit refs/heads/master
147 37d588cc39848368810e88332bd03b083f2ce3ac commit refs/patches/master/add
148 33633e7a1aa31972f125878baf7807be57b1672d commit refs/patches/master/modify
149 % guilt branch topic
150 Switched to branch "topic"
151 % git for-each-ref
152 37d588cc39848368810e88332bd03b083f2ce3ac commit refs/heads/master
153 37d588cc39848368810e88332bd03b083f2ce3ac commit refs/heads/topic
154 37d588cc39848368810e88332bd03b083f2ce3ac commit refs/patches/master/add
155 33633e7a1aa31972f125878baf7807be57b1672d commit refs/patches/master/modify
156 37d588cc39848368810e88332bd03b083f2ce3ac commit refs/patches/topic/add
157 33633e7a1aa31972f125878baf7807be57b1672d commit refs/patches/topic/modify
158 % guilt pop -a
159 All patches popped.
160 % guilt push
161 Applying patch..modify
162 Patch applied.
163 % git for-each-ref
164 37d588cc39848368810e88332bd03b083f2ce3ac commit refs/heads/master
165 33633e7a1aa31972f125878baf7807be57b1672d commit refs/heads/topic
166 37d588cc39848368810e88332bd03b083f2ce3ac commit refs/patches/master/add
167 33633e7a1aa31972f125878baf7807be57b1672d commit refs/patches/master/modify
168 33633e7a1aa31972f125878baf7807be57b1672d commit refs/patches/topic/modify
169 % guilt pop -a
170 All patches popped.
171 % git checkout master
172 Switched to branch "master"
173 % guilt pop -a
174 All patches popped.
175 % git branch -d topic
176 Deleted branch topic (was d485041).
177 % rm -r .git/patches/topic
178 % git for-each-ref
179 d4850419ccc1146c7169f500725ce504b9774ed0 commit refs/heads/master
180 % list_files
181 d .git/patches
182 d .git/patches/master
183 d .git/refs/patches
184 f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
185 f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
186 f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
187 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series
188 f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
189 f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status
190 % guilt push -a
191 Applying patch..modify
192 Patch applied.
193 Applying patch..add
194 Patch applied.
195 Applying patch..remove
196 Patch applied.
197 Applying patch..mode
198 Patch applied.
199 % guilt branch topic
200 Switched to branch "topic"
201 % git for-each-ref
202 ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba commit refs/heads/master
203 ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba commit refs/heads/topic
204 37d588cc39848368810e88332bd03b083f2ce3ac commit refs/patches/master/add
205 ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba commit refs/patches/master/mode
206 33633e7a1aa31972f125878baf7807be57b1672d commit refs/patches/master/modify
207 ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 commit refs/patches/master/remove
208 37d588cc39848368810e88332bd03b083f2ce3ac commit refs/patches/topic/add
209 ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba commit refs/patches/topic/mode
210 33633e7a1aa31972f125878baf7807be57b1672d commit refs/patches/topic/modify
211 ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 commit refs/patches/topic/remove
212 % guilt pop -a
213 All patches popped.
214 % git checkout master
215 Switched to branch "master"
216 % guilt pop -a
217 All patches popped.
218 % git branch -d topic
219 Deleted branch topic (was d485041).
220 % rm -r .git/patches/topic
221 % git for-each-ref
222 d4850419ccc1146c7169f500725ce504b9774ed0 commit refs/heads/master
223 % list_files
224 d .git/patches
225 d .git/patches/master
226 d .git/refs/patches
227 f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
228 f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
229 f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
230 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series
231 f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
232 f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status
233 % guilt branch topic
234 Switched to branch "topic"
235 % git for-each-ref
236 d4850419ccc1146c7169f500725ce504b9774ed0 commit refs/heads/master
237 d4850419ccc1146c7169f500725ce504b9774ed0 commit refs/heads/topic
238 % list_files
239 d .git/patches
240 d .git/patches/master
241 d .git/patches/topic
242 d .git/refs/patches
243 f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
244 f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/topic/mode
245 f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
246 f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/topic/remove
247 f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
248 f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/topic/add
249 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series
250 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/topic/series
251 f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
252 f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/topic/modify
253 f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status
254 f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/topic/status
255 % guilt pop -a
256 No patches applied.
257 % git checkout master
258 Switched to branch "master"
259 % guilt pop -a
260 No patches applied.
261 % git branch -d topic
262 Deleted branch topic (was d485041).
263 % rm -r .git/patches/topic
264 % git for-each-ref
265 d4850419ccc1146c7169f500725ce504b9774ed0 commit refs/heads/master
266 % list_files
267 d .git/patches
268 d .git/patches/master
269 d .git/refs/patches
270 f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
271 f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
272 f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
273 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series
274 f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
275 f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status
276 % guilt push -a
277 Applying patch..modify
278 Patch applied.
279 Applying patch..add
280 Patch applied.
281 Applying patch..remove
282 Patch applied.
283 Applying patch..mode
284 Patch applied.
285 % guilt branch topic
286 Switched to branch "topic"
287 % git for-each-ref
288 ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba commit refs/heads/master
289 ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba commit refs/heads/topic
290 37d588cc39848368810e88332bd03b083f2ce3ac commit refs/patches/master/add
291 ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba commit refs/patches/master/mode
292 33633e7a1aa31972f125878baf7807be57b1672d commit refs/patches/master/modify
293 ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 commit refs/patches/master/remove
294 37d588cc39848368810e88332bd03b083f2ce3ac commit refs/patches/topic/add
295 ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba commit refs/patches/topic/mode
296 33633e7a1aa31972f125878baf7807be57b1672d commit refs/patches/topic/modify
297 ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 commit refs/patches/topic/remove
298 % list_files
299 d .git/patches
300 d .git/patches/master
301 d .git/patches/topic
302 d .git/refs/patches
303 d .git/refs/patches/master
304 d .git/refs/patches/topic
305 f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
306 f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/topic/mode
307 f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
308 f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/topic/remove
309 f 71596bf71b72c2717e1aee378aabefbfa19ab7c8 .git/patches/master/status
310 f 71596bf71b72c2717e1aee378aabefbfa19ab7c8 .git/patches/topic/status
311 f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
312 f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/topic/add
313 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series
314 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/topic/series
315 f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
316 f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/topic/modify
317 r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/master/modify
318 r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/topic/modify
319 r 37d588cc39848368810e88332bd03b083f2ce3ac .git/refs/patches/master/add
320 r 37d588cc39848368810e88332bd03b083f2ce3ac .git/refs/patches/topic/add
321 r ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba .git/refs/patches/master/mode
322 r ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba .git/refs/patches/topic/mode
323 r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 .git/refs/patches/master/remove
324 r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 .git/refs/patches/topic/remove
325 % guilt pop -a
326 All patches popped.
327 % git for-each-ref
328 ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba commit refs/heads/master
329 d4850419ccc1146c7169f500725ce504b9774ed0 commit refs/heads/topic
330 37d588cc39848368810e88332bd03b083f2ce3ac commit refs/patches/master/add
331 ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba commit refs/patches/master/mode
332 33633e7a1aa31972f125878baf7807be57b1672d commit refs/patches/master/modify
333 ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 commit refs/patches/master/remove
334 % guilt pop -a
335 No patches applied.
336 % git checkout master
337 Switched to branch "master"
338 % guilt pop -a
339 All patches popped.
340 % git branch -d topic
341 Deleted branch topic (was d485041).
342 % rm -r .git/patches/topic
343 % git for-each-ref
344 d4850419ccc1146c7169f500725ce504b9774ed0 commit refs/heads/master
345 % list_files
346 d .git/patches
347 d .git/patches/master
348 d .git/refs/patches
349 f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
350 f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
351 f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
352 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series
353 f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
354 f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status
355 % guilt new newpatch
356 % git for-each-ref --format=%(refname)
357 refs/heads/master
358 refs/patches/master/newpatch
359 % guilt pop
360 All patches popped.
361 % guilt push
362 Applying patch..newpatch
363 Patch applied.
364 % git for-each-ref
365 25465dc1687f3833ecbd4e8bca437e522d7026db commit refs/heads/master
366 25465dc1687f3833ecbd4e8bca437e522d7026db commit refs/patches/master/newpatch
367 % git branch
368 * master
369 % guilt applied
370 newpatch
371 % guilt commit -a
372 % git for-each-ref
373 25465dc1687f3833ecbd4e8bca437e522d7026db commit refs/heads/master
374 % git branch
375 * master
376 % guilt push -a
377 Applying patch..modify
378 Patch applied.
379 Applying patch..add
380 Patch applied.
381 Applying patch..remove
382 Patch applied.
383 Applying patch..mode
384 Patch applied.
385 % guilt applied
386 modify
387 add
388 remove
389 mode
390 % git branch
391 * master
392 % git for-each-ref
393 fefbdcef61022d473838926619f31e030dd04fdc commit refs/heads/master
394 5effcbeb303e8433935151d8c69f3bf63db1e8ef commit refs/patches/master/add
395 fefbdcef61022d473838926619f31e030dd04fdc commit refs/patches/master/mode
396 9509f22e2e627756d87b42432931c45955b74234 commit refs/patches/master/modify
397 9cbe2fc643b1a9e2179a8738f80424a1c2aa202d commit refs/patches/master/remove
398 % guilt commit -n 2
399 % git for-each-ref
400 fefbdcef61022d473838926619f31e030dd04fdc commit refs/heads/master
401 fefbdcef61022d473838926619f31e030dd04fdc commit refs/patches/master/mode
402 9cbe2fc643b1a9e2179a8738f80424a1c2aa202d commit refs/patches/master/remove
403 % git branch
404 * master
405 % guilt commit -n 2
406 % git for-each-ref
407 fefbdcef61022d473838926619f31e030dd04fdc commit refs/heads/master
408 % git branch
409 * master
410 % guilt series