| blob | ad5c0812280c7c2d36f39661fb9e87160473874c |
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 d .git/refs/patches/master
185 d .git/refs/patches/topic
186 f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
187 f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
188 f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
189 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series
190 f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
191 f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status
192 % guilt push -a
193 Applying patch..modify
194 Patch applied.
195 Applying patch..add
196 Patch applied.
197 Applying patch..remove
198 Patch applied.
199 Applying patch..mode
200 Patch applied.
201 % guilt branch topic
202 Switched to branch "topic"
203 % git for-each-ref
204 ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba commit refs/heads/master
205 ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba commit refs/heads/topic
206 37d588cc39848368810e88332bd03b083f2ce3ac commit refs/patches/master/add
207 ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba commit refs/patches/master/mode
208 33633e7a1aa31972f125878baf7807be57b1672d commit refs/patches/master/modify
209 ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 commit refs/patches/master/remove
210 37d588cc39848368810e88332bd03b083f2ce3ac commit refs/patches/topic/add
211 ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba commit refs/patches/topic/mode
212 33633e7a1aa31972f125878baf7807be57b1672d commit refs/patches/topic/modify
213 ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 commit refs/patches/topic/remove
214 % guilt pop -a
215 All patches popped.
216 % git checkout master
217 Switched to branch "master"
218 % guilt pop -a
219 All patches popped.
220 % git branch -d topic
221 Deleted branch topic (was d485041).
222 % rm -r .git/patches/topic
223 % git for-each-ref
224 d4850419ccc1146c7169f500725ce504b9774ed0 commit refs/heads/master
225 % list_files
226 d .git/patches
227 d .git/patches/master
228 d .git/refs/patches
229 d .git/refs/patches/master
230 d .git/refs/patches/topic
231 f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
232 f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
233 f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
234 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series
235 f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
236 f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status
237 % guilt branch topic
238 Switched to branch "topic"
239 % git for-each-ref
240 d4850419ccc1146c7169f500725ce504b9774ed0 commit refs/heads/master
241 d4850419ccc1146c7169f500725ce504b9774ed0 commit refs/heads/topic
242 % list_files
243 d .git/patches
244 d .git/patches/master
245 d .git/patches/topic
246 d .git/refs/patches
247 d .git/refs/patches/master
248 d .git/refs/patches/topic
249 f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
250 f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/topic/mode
251 f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
252 f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/topic/remove
253 f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
254 f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/topic/add
255 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series
256 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/topic/series
257 f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
258 f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/topic/modify
259 f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status
260 f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/topic/status
261 % guilt pop -a
262 No patches applied.
263 % git checkout master
264 Switched to branch "master"
265 % guilt pop -a
266 No patches applied.
267 % git branch -d topic
268 Deleted branch topic (was d485041).
269 % rm -r .git/patches/topic
270 % git for-each-ref
271 d4850419ccc1146c7169f500725ce504b9774ed0 commit refs/heads/master
272 % list_files
273 d .git/patches
274 d .git/patches/master
275 d .git/refs/patches
276 d .git/refs/patches/master
277 d .git/refs/patches/topic
278 f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
279 f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
280 f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
281 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series
282 f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
283 f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status
284 % guilt push -a
285 Applying patch..modify
286 Patch applied.
287 Applying patch..add
288 Patch applied.
289 Applying patch..remove
290 Patch applied.
291 Applying patch..mode
292 Patch applied.
293 % guilt branch topic
294 Switched to branch "topic"
295 % git for-each-ref
296 ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba commit refs/heads/master
297 ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba commit refs/heads/topic
298 37d588cc39848368810e88332bd03b083f2ce3ac commit refs/patches/master/add
299 ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba commit refs/patches/master/mode
300 33633e7a1aa31972f125878baf7807be57b1672d commit refs/patches/master/modify
301 ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 commit refs/patches/master/remove
302 37d588cc39848368810e88332bd03b083f2ce3ac commit refs/patches/topic/add
303 ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba commit refs/patches/topic/mode
304 33633e7a1aa31972f125878baf7807be57b1672d commit refs/patches/topic/modify
305 ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 commit refs/patches/topic/remove
306 % list_files
307 d .git/patches
308 d .git/patches/master
309 d .git/patches/topic
310 d .git/refs/patches
311 d .git/refs/patches/master
312 d .git/refs/patches/topic
313 f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
314 f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/topic/mode
315 f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
316 f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/topic/remove
317 f 71596bf71b72c2717e1aee378aabefbfa19ab7c8 .git/patches/master/status
318 f 71596bf71b72c2717e1aee378aabefbfa19ab7c8 .git/patches/topic/status
319 f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
320 f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/topic/add
321 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series
322 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/topic/series
323 f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
324 f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/topic/modify
325 r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/master/modify
326 r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/topic/modify
327 r 37d588cc39848368810e88332bd03b083f2ce3ac .git/refs/patches/master/add
328 r 37d588cc39848368810e88332bd03b083f2ce3ac .git/refs/patches/topic/add
329 r ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba .git/refs/patches/master/mode
330 r ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba .git/refs/patches/topic/mode
331 r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 .git/refs/patches/master/remove
332 r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 .git/refs/patches/topic/remove
333 % guilt pop -a
334 All patches popped.
335 % git for-each-ref
336 ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba commit refs/heads/master
337 d4850419ccc1146c7169f500725ce504b9774ed0 commit refs/heads/topic
338 37d588cc39848368810e88332bd03b083f2ce3ac commit refs/patches/master/add
339 ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba commit refs/patches/master/mode
340 33633e7a1aa31972f125878baf7807be57b1672d commit refs/patches/master/modify
341 ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 commit refs/patches/master/remove
342 % guilt pop -a
343 No patches applied.
344 % git checkout master
345 Switched to branch "master"
346 % guilt pop -a
347 All patches popped.
348 % git branch -d topic
349 Deleted branch topic (was d485041).
350 % rm -r .git/patches/topic
351 % git for-each-ref
352 d4850419ccc1146c7169f500725ce504b9774ed0 commit refs/heads/master
353 % list_files
354 d .git/patches
355 d .git/patches/master
356 d .git/refs/patches
357 d .git/refs/patches/master
358 d .git/refs/patches/topic
359 f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
360 f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
361 f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
362 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series
363 f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
364 f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status
365 % guilt new newpatch
366 % git for-each-ref --format=%(refname)
367 refs/heads/master
368 refs/patches/master/newpatch
369 % guilt pop
370 All patches popped.
371 % guilt push
372 Applying patch..newpatch
373 Patch applied.
374 % git for-each-ref
375 25465dc1687f3833ecbd4e8bca437e522d7026db commit refs/heads/master
376 25465dc1687f3833ecbd4e8bca437e522d7026db commit refs/patches/master/newpatch
377 % git branch
378 * master
379 % guilt applied
380 newpatch
381 % guilt commit -a
382 % git for-each-ref
383 25465dc1687f3833ecbd4e8bca437e522d7026db commit refs/heads/master
384 % git branch
385 * master
386 % guilt push -a
387 Applying patch..modify
388 Patch applied.
389 Applying patch..add
390 Patch applied.
391 Applying patch..remove
392 Patch applied.
393 Applying patch..mode
394 Patch applied.
395 % guilt applied
396 modify
397 add
398 remove
399 mode
400 % git branch
401 * master
402 % git for-each-ref
403 fefbdcef61022d473838926619f31e030dd04fdc commit refs/heads/master
404 5effcbeb303e8433935151d8c69f3bf63db1e8ef commit refs/patches/master/add
405 fefbdcef61022d473838926619f31e030dd04fdc commit refs/patches/master/mode
406 9509f22e2e627756d87b42432931c45955b74234 commit refs/patches/master/modify
407 9cbe2fc643b1a9e2179a8738f80424a1c2aa202d commit refs/patches/master/remove
408 % guilt commit -n 2
409 % git for-each-ref
410 fefbdcef61022d473838926619f31e030dd04fdc commit refs/heads/master
411 fefbdcef61022d473838926619f31e030dd04fdc commit refs/patches/master/mode
412 9cbe2fc643b1a9e2179a8738f80424a1c2aa202d commit refs/patches/master/remove
413 % git branch
414 * master
415 % guilt commit -n 2
416 % git for-each-ref
417 fefbdcef61022d473838926619f31e030dd04fdc commit refs/heads/master
418 % git branch
419 * master
420 % guilt series