[PATCH] guilt: improve patch header handling
[guilt/mob.git] / regression / t-020.out
blobfb433e7b024b313f7c5a25fb14f524731b51be48
1 % setup_repo
2 % guilt-push
3 Applying patch..modify
4 Patch applied.
5 % list_files
6 d .git/patches
7 d .git/patches/master
8 d .git/refs/patches
9 d .git/refs/patches/master
10 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
11 f 413390f3906f16f30b054a4fb86c1e014b964504  .git/patches/master/remove
12 f 7b80669540a0ba5ec6098f50bb7923921278e85a  .git/patches/master/status
13 f 9c18cc7abe6b87f18503714a80a677b4094eb457  .git/patches/master/add
14 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
15 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
16 r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
17 % git log -p
18 commit 33633e7a1aa31972f125878baf7807be57b1672d
19 Author: Author Name <author@email>
20 Date:   Mon Jan 1 00:00:00 2007 +0000
22     patch modify
24 diff --git a/def b/def
25 index 8baef1b..7d69c2f 100644
26 --- a/def
27 +++ b/def
28 @@ -1 +1,2 @@
29  abc
30 +asjhfksad
32 commit d4850419ccc1146c7169f500725ce504b9774ed0
33 Author: Author Name <author@email>
34 Date:   Mon Jan 1 00:00:00 2007 +0000
36     initial
37     
38     Signed-off-by: Commiter Name <commiter@email>
40 diff --git a/def b/def
41 new file mode 100644
42 index 0000000..8baef1b
43 --- /dev/null
44 +++ b/def
45 @@ -0,0 +1 @@
46 +abc
47 % guilt-push
48 Applying patch..add
49 Patch applied.
50 % list_files
51 d .git/patches
52 d .git/patches/master
53 d .git/refs/patches
54 d .git/refs/patches/master
55 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
56 f 413390f3906f16f30b054a4fb86c1e014b964504  .git/patches/master/remove
57 f 6e9645b29c7233ecdf1494834e83c67a37464548  .git/patches/master/status
58 f 9c18cc7abe6b87f18503714a80a677b4094eb457  .git/patches/master/add
59 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
60 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
61 r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
62 r 37d588cc39848368810e88332bd03b083f2ce3ac  .git/refs/patches/master/add
63 % git log -p
64 commit 37d588cc39848368810e88332bd03b083f2ce3ac
65 Author: Author Name <author@email>
66 Date:   Mon Jan 1 00:00:00 2007 +0000
68     patch add
70 diff --git a/abd b/abd
71 new file mode 100644
72 index 0000000..fd3896d
73 --- /dev/null
74 +++ b/abd
75 @@ -0,0 +1 @@
76 +‰öu\eØ\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤\r\x7fªÂ~·
77 \ No newline at end of file
79 commit 33633e7a1aa31972f125878baf7807be57b1672d
80 Author: Author Name <author@email>
81 Date:   Mon Jan 1 00:00:00 2007 +0000
83     patch modify
85 diff --git a/def b/def
86 index 8baef1b..7d69c2f 100644
87 --- a/def
88 +++ b/def
89 @@ -1 +1,2 @@
90  abc
91 +asjhfksad
93 commit d4850419ccc1146c7169f500725ce504b9774ed0
94 Author: Author Name <author@email>
95 Date:   Mon Jan 1 00:00:00 2007 +0000
97     initial
98     
99     Signed-off-by: Commiter Name <commiter@email>
101 diff --git a/def b/def
102 new file mode 100644
103 index 0000000..8baef1b
104 --- /dev/null
105 +++ b/def
106 @@ -0,0 +1 @@
107 +abc
108 % guilt-push
109 Applying patch..remove
110 Patch applied.
111 % list_files
112 d .git/patches
113 d .git/patches/master
114 d .git/refs/patches
115 d .git/refs/patches/master
116 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
117 f 413390f3906f16f30b054a4fb86c1e014b964504  .git/patches/master/remove
118 f 9c18cc7abe6b87f18503714a80a677b4094eb457  .git/patches/master/add
119 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
120 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
121 f f322f08d907e3737a4321b0ec90bc545f71af7cf  .git/patches/master/status
122 r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
123 r 37d588cc39848368810e88332bd03b083f2ce3ac  .git/refs/patches/master/add
124 r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9  .git/refs/patches/master/remove
125 % git log -p
126 commit ffb7faa126a6d91bcdd44a494f76b96dd860b8b9
127 Author: Author Name <author@email>
128 Date:   Mon Jan 1 00:00:00 2007 +0000
130     patch remove
132 diff --git a/abd b/abd
133 deleted file mode 100644
134 index fd3896d..0000000
135 --- a/abd
136 +++ /dev/null
137 @@ -1 +0,0 @@
138 -‰öu\eØ\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤\r\x7fªÂ~·
139 \ No newline at end of file
141 commit 37d588cc39848368810e88332bd03b083f2ce3ac
142 Author: Author Name <author@email>
143 Date:   Mon Jan 1 00:00:00 2007 +0000
145     patch add
147 diff --git a/abd b/abd
148 new file mode 100644
149 index 0000000..fd3896d
150 --- /dev/null
151 +++ b/abd
152 @@ -0,0 +1 @@
153 +‰öu\eØ\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤\r\x7fªÂ~·
154 \ No newline at end of file
156 commit 33633e7a1aa31972f125878baf7807be57b1672d
157 Author: Author Name <author@email>
158 Date:   Mon Jan 1 00:00:00 2007 +0000
160     patch modify
162 diff --git a/def b/def
163 index 8baef1b..7d69c2f 100644
164 --- a/def
165 +++ b/def
166 @@ -1 +1,2 @@
167  abc
168 +asjhfksad
170 commit d4850419ccc1146c7169f500725ce504b9774ed0
171 Author: Author Name <author@email>
172 Date:   Mon Jan 1 00:00:00 2007 +0000
174     initial
175     
176     Signed-off-by: Commiter Name <commiter@email>
178 diff --git a/def b/def
179 new file mode 100644
180 index 0000000..8baef1b
181 --- /dev/null
182 +++ b/def
183 @@ -0,0 +1 @@
184 +abc
185 % guilt-push
186 Applying patch..mode
187 Patch applied.
188 % list_files
189 d .git/patches
190 d .git/patches/master
191 d .git/refs/patches
192 d .git/refs/patches/master
193 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
194 f 413390f3906f16f30b054a4fb86c1e014b964504  .git/patches/master/remove
195 f 71596bf71b72c2717e1aee378aabefbfa19ab7c8  .git/patches/master/status
196 f 9c18cc7abe6b87f18503714a80a677b4094eb457  .git/patches/master/add
197 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
198 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
199 r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
200 r 37d588cc39848368810e88332bd03b083f2ce3ac  .git/refs/patches/master/add
201 r ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba  .git/refs/patches/master/mode
202 r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9  .git/refs/patches/master/remove
203 % git log -p
204 commit ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba
205 Author: Author Name <author@email>
206 Date:   Mon Jan 1 00:00:00 2007 +0000
208     patch mode
210 diff --git a/def b/def
211 old mode 100644
212 new mode 100755
214 commit ffb7faa126a6d91bcdd44a494f76b96dd860b8b9
215 Author: Author Name <author@email>
216 Date:   Mon Jan 1 00:00:00 2007 +0000
218     patch remove
220 diff --git a/abd b/abd
221 deleted file mode 100644
222 index fd3896d..0000000
223 --- a/abd
224 +++ /dev/null
225 @@ -1 +0,0 @@
226 -‰öu\eØ\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤\r\x7fªÂ~·
227 \ No newline at end of file
229 commit 37d588cc39848368810e88332bd03b083f2ce3ac
230 Author: Author Name <author@email>
231 Date:   Mon Jan 1 00:00:00 2007 +0000
233     patch add
235 diff --git a/abd b/abd
236 new file mode 100644
237 index 0000000..fd3896d
238 --- /dev/null
239 +++ b/abd
240 @@ -0,0 +1 @@
241 +‰öu\eØ\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤\r\x7fªÂ~·
242 \ No newline at end of file
244 commit 33633e7a1aa31972f125878baf7807be57b1672d
245 Author: Author Name <author@email>
246 Date:   Mon Jan 1 00:00:00 2007 +0000
248     patch modify
250 diff --git a/def b/def
251 index 8baef1b..7d69c2f 100644
252 --- a/def
253 +++ b/def
254 @@ -1 +1,2 @@
255  abc
256 +asjhfksad
258 commit d4850419ccc1146c7169f500725ce504b9774ed0
259 Author: Author Name <author@email>
260 Date:   Mon Jan 1 00:00:00 2007 +0000
262     initial
263     
264     Signed-off-by: Commiter Name <commiter@email>
266 diff --git a/def b/def
267 new file mode 100644
268 index 0000000..8baef1b
269 --- /dev/null
270 +++ b/def
271 @@ -0,0 +1 @@
272 +abc
273 % guilt-pop --all
274 All patches popped.
275 % guilt-push
276 Applying patch..modify
277 Patch applied.
278 % list_files
279 d .git/patches
280 d .git/patches/master
281 d .git/refs/patches
282 d .git/refs/patches/master
283 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
284 f 413390f3906f16f30b054a4fb86c1e014b964504  .git/patches/master/remove
285 f 7b80669540a0ba5ec6098f50bb7923921278e85a  .git/patches/master/status
286 f 9c18cc7abe6b87f18503714a80a677b4094eb457  .git/patches/master/add
287 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
288 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
289 r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
290 % git log -p
291 commit 33633e7a1aa31972f125878baf7807be57b1672d
292 Author: Author Name <author@email>
293 Date:   Mon Jan 1 00:00:00 2007 +0000
295     patch modify
297 diff --git a/def b/def
298 index 8baef1b..7d69c2f 100644
299 --- a/def
300 +++ b/def
301 @@ -1 +1,2 @@
302  abc
303 +asjhfksad
305 commit d4850419ccc1146c7169f500725ce504b9774ed0
306 Author: Author Name <author@email>
307 Date:   Mon Jan 1 00:00:00 2007 +0000
309     initial
310     
311     Signed-off-by: Commiter Name <commiter@email>
313 diff --git a/def b/def
314 new file mode 100644
315 index 0000000..8baef1b
316 --- /dev/null
317 +++ b/def
318 @@ -0,0 +1 @@
319 +abc
320 % guilt-pop --all
321 All patches popped.
322 % guilt-push
323 Applying patch..modify
324 Patch applied.
325 % list_files
326 d .git/patches
327 d .git/patches/master
328 d .git/refs/patches
329 d .git/refs/patches/master
330 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
331 f 413390f3906f16f30b054a4fb86c1e014b964504  .git/patches/master/remove
332 f 7b80669540a0ba5ec6098f50bb7923921278e85a  .git/patches/master/status
333 f 9c18cc7abe6b87f18503714a80a677b4094eb457  .git/patches/master/add
334 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
335 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
336 r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
337 % git log -p
338 commit 33633e7a1aa31972f125878baf7807be57b1672d
339 Author: Author Name <author@email>
340 Date:   Mon Jan 1 00:00:00 2007 +0000
342     patch modify
344 diff --git a/def b/def
345 index 8baef1b..7d69c2f 100644
346 --- a/def
347 +++ b/def
348 @@ -1 +1,2 @@
349  abc
350 +asjhfksad
352 commit d4850419ccc1146c7169f500725ce504b9774ed0
353 Author: Author Name <author@email>
354 Date:   Mon Jan 1 00:00:00 2007 +0000
356     initial
357     
358     Signed-off-by: Commiter Name <commiter@email>
360 diff --git a/def b/def
361 new file mode 100644
362 index 0000000..8baef1b
363 --- /dev/null
364 +++ b/def
365 @@ -0,0 +1 @@
366 +abc
367 % guilt-pop --all
368 All patches popped.
369 % guilt-push
370 Applying patch..modify
371 Patch applied.
372 % list_files
373 d .git/patches
374 d .git/patches/master
375 d .git/refs/patches
376 d .git/refs/patches/master
377 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
378 f 413390f3906f16f30b054a4fb86c1e014b964504  .git/patches/master/remove
379 f 7b80669540a0ba5ec6098f50bb7923921278e85a  .git/patches/master/status
380 f 9c18cc7abe6b87f18503714a80a677b4094eb457  .git/patches/master/add
381 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
382 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
383 r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
384 % git log -p
385 commit 33633e7a1aa31972f125878baf7807be57b1672d
386 Author: Author Name <author@email>
387 Date:   Mon Jan 1 00:00:00 2007 +0000
389     patch modify
391 diff --git a/def b/def
392 index 8baef1b..7d69c2f 100644
393 --- a/def
394 +++ b/def
395 @@ -1 +1,2 @@
396  abc
397 +asjhfksad
399 commit d4850419ccc1146c7169f500725ce504b9774ed0
400 Author: Author Name <author@email>
401 Date:   Mon Jan 1 00:00:00 2007 +0000
403     initial
404     
405     Signed-off-by: Commiter Name <commiter@email>
407 diff --git a/def b/def
408 new file mode 100644
409 index 0000000..8baef1b
410 --- /dev/null
411 +++ b/def
412 @@ -0,0 +1 @@
413 +abc
414 % guilt-pop --all
415 All patches popped.
416 % guilt-push
417 Applying patch..modify
418 Patch applied.
419 % list_files
420 d .git/patches
421 d .git/patches/master
422 d .git/refs/patches
423 d .git/refs/patches/master
424 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
425 f 413390f3906f16f30b054a4fb86c1e014b964504  .git/patches/master/remove
426 f 7b80669540a0ba5ec6098f50bb7923921278e85a  .git/patches/master/status
427 f 9c18cc7abe6b87f18503714a80a677b4094eb457  .git/patches/master/add
428 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
429 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
430 r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
431 % git log -p
432 commit 33633e7a1aa31972f125878baf7807be57b1672d
433 Author: Author Name <author@email>
434 Date:   Mon Jan 1 00:00:00 2007 +0000
436     patch modify
438 diff --git a/def b/def
439 index 8baef1b..7d69c2f 100644
440 --- a/def
441 +++ b/def
442 @@ -1 +1,2 @@
443  abc
444 +asjhfksad
446 commit d4850419ccc1146c7169f500725ce504b9774ed0
447 Author: Author Name <author@email>
448 Date:   Mon Jan 1 00:00:00 2007 +0000
450     initial
451     
452     Signed-off-by: Commiter Name <commiter@email>
454 diff --git a/def b/def
455 new file mode 100644
456 index 0000000..8baef1b
457 --- /dev/null
458 +++ b/def
459 @@ -0,0 +1 @@
460 +abc
461 % guilt-pop --all
462 All patches popped.
463 % guilt-push
464 Applying patch..modify
465 Patch applied.
466 % list_files
467 d .git/patches
468 d .git/patches/master
469 d .git/refs/patches
470 d .git/refs/patches/master
471 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
472 f 413390f3906f16f30b054a4fb86c1e014b964504  .git/patches/master/remove
473 f 7b80669540a0ba5ec6098f50bb7923921278e85a  .git/patches/master/status
474 f 9c18cc7abe6b87f18503714a80a677b4094eb457  .git/patches/master/add
475 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
476 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
477 r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
478 % git log -p
479 commit 33633e7a1aa31972f125878baf7807be57b1672d
480 Author: Author Name <author@email>
481 Date:   Mon Jan 1 00:00:00 2007 +0000
483     patch modify
485 diff --git a/def b/def
486 index 8baef1b..7d69c2f 100644
487 --- a/def
488 +++ b/def
489 @@ -1 +1,2 @@
490  abc
491 +asjhfksad
493 commit d4850419ccc1146c7169f500725ce504b9774ed0
494 Author: Author Name <author@email>
495 Date:   Mon Jan 1 00:00:00 2007 +0000
497     initial
498     
499     Signed-off-by: Commiter Name <commiter@email>
501 diff --git a/def b/def
502 new file mode 100644
503 index 0000000..8baef1b
504 --- /dev/null
505 +++ b/def
506 @@ -0,0 +1 @@
507 +abc
508 % guilt-push
509 Applying patch..add
510 Patch applied.
511 % list_files
512 d .git/patches
513 d .git/patches/master
514 d .git/refs/patches
515 d .git/refs/patches/master
516 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
517 f 413390f3906f16f30b054a4fb86c1e014b964504  .git/patches/master/remove
518 f 6e9645b29c7233ecdf1494834e83c67a37464548  .git/patches/master/status
519 f 9c18cc7abe6b87f18503714a80a677b4094eb457  .git/patches/master/add
520 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
521 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
522 r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
523 r 37d588cc39848368810e88332bd03b083f2ce3ac  .git/refs/patches/master/add
524 % git log -p
525 commit 37d588cc39848368810e88332bd03b083f2ce3ac
526 Author: Author Name <author@email>
527 Date:   Mon Jan 1 00:00:00 2007 +0000
529     patch add
531 diff --git a/abd b/abd
532 new file mode 100644
533 index 0000000..fd3896d
534 --- /dev/null
535 +++ b/abd
536 @@ -0,0 +1 @@
537 +‰öu\eØ\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤\r\x7fªÂ~·
538 \ No newline at end of file
540 commit 33633e7a1aa31972f125878baf7807be57b1672d
541 Author: Author Name <author@email>
542 Date:   Mon Jan 1 00:00:00 2007 +0000
544     patch modify
546 diff --git a/def b/def
547 index 8baef1b..7d69c2f 100644
548 --- a/def
549 +++ b/def
550 @@ -1 +1,2 @@
551  abc
552 +asjhfksad
554 commit d4850419ccc1146c7169f500725ce504b9774ed0
555 Author: Author Name <author@email>
556 Date:   Mon Jan 1 00:00:00 2007 +0000
558     initial
559     
560     Signed-off-by: Commiter Name <commiter@email>
562 diff --git a/def b/def
563 new file mode 100644
564 index 0000000..8baef1b
565 --- /dev/null
566 +++ b/def
567 @@ -0,0 +1 @@
568 +abc
569 % guilt-push
570 Applying patch..remove
571 Patch applied.
572 % list_files
573 d .git/patches
574 d .git/patches/master
575 d .git/refs/patches
576 d .git/refs/patches/master
577 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
578 f 413390f3906f16f30b054a4fb86c1e014b964504  .git/patches/master/remove
579 f 9c18cc7abe6b87f18503714a80a677b4094eb457  .git/patches/master/add
580 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
581 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
582 f f322f08d907e3737a4321b0ec90bc545f71af7cf  .git/patches/master/status
583 r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
584 r 37d588cc39848368810e88332bd03b083f2ce3ac  .git/refs/patches/master/add
585 r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9  .git/refs/patches/master/remove
586 % git log -p
587 commit ffb7faa126a6d91bcdd44a494f76b96dd860b8b9
588 Author: Author Name <author@email>
589 Date:   Mon Jan 1 00:00:00 2007 +0000
591     patch remove
593 diff --git a/abd b/abd
594 deleted file mode 100644
595 index fd3896d..0000000
596 --- a/abd
597 +++ /dev/null
598 @@ -1 +0,0 @@
599 -‰öu\eØ\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤\r\x7fªÂ~·
600 \ No newline at end of file
602 commit 37d588cc39848368810e88332bd03b083f2ce3ac
603 Author: Author Name <author@email>
604 Date:   Mon Jan 1 00:00:00 2007 +0000
606     patch add
608 diff --git a/abd b/abd
609 new file mode 100644
610 index 0000000..fd3896d
611 --- /dev/null
612 +++ b/abd
613 @@ -0,0 +1 @@
614 +‰öu\eØ\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤\r\x7fªÂ~·
615 \ No newline at end of file
617 commit 33633e7a1aa31972f125878baf7807be57b1672d
618 Author: Author Name <author@email>
619 Date:   Mon Jan 1 00:00:00 2007 +0000
621     patch modify
623 diff --git a/def b/def
624 index 8baef1b..7d69c2f 100644
625 --- a/def
626 +++ b/def
627 @@ -1 +1,2 @@
628  abc
629 +asjhfksad
631 commit d4850419ccc1146c7169f500725ce504b9774ed0
632 Author: Author Name <author@email>
633 Date:   Mon Jan 1 00:00:00 2007 +0000
635     initial
636     
637     Signed-off-by: Commiter Name <commiter@email>
639 diff --git a/def b/def
640 new file mode 100644
641 index 0000000..8baef1b
642 --- /dev/null
643 +++ b/def
644 @@ -0,0 +1 @@
645 +abc
646 % guilt-push
647 Applying patch..mode
648 Patch applied.
649 % list_files
650 d .git/patches
651 d .git/patches/master
652 d .git/refs/patches
653 d .git/refs/patches/master
654 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
655 f 413390f3906f16f30b054a4fb86c1e014b964504  .git/patches/master/remove
656 f 71596bf71b72c2717e1aee378aabefbfa19ab7c8  .git/patches/master/status
657 f 9c18cc7abe6b87f18503714a80a677b4094eb457  .git/patches/master/add
658 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
659 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
660 r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
661 r 37d588cc39848368810e88332bd03b083f2ce3ac  .git/refs/patches/master/add
662 r ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba  .git/refs/patches/master/mode
663 r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9  .git/refs/patches/master/remove
664 % git log -p
665 commit ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba
666 Author: Author Name <author@email>
667 Date:   Mon Jan 1 00:00:00 2007 +0000
669     patch mode
671 diff --git a/def b/def
672 old mode 100644
673 new mode 100755
675 commit ffb7faa126a6d91bcdd44a494f76b96dd860b8b9
676 Author: Author Name <author@email>
677 Date:   Mon Jan 1 00:00:00 2007 +0000
679     patch remove
681 diff --git a/abd b/abd
682 deleted file mode 100644
683 index fd3896d..0000000
684 --- a/abd
685 +++ /dev/null
686 @@ -1 +0,0 @@
687 -‰öu\eØ\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤\r\x7fªÂ~·
688 \ No newline at end of file
690 commit 37d588cc39848368810e88332bd03b083f2ce3ac
691 Author: Author Name <author@email>
692 Date:   Mon Jan 1 00:00:00 2007 +0000
694     patch add
696 diff --git a/abd b/abd
697 new file mode 100644
698 index 0000000..fd3896d
699 --- /dev/null
700 +++ b/abd
701 @@ -0,0 +1 @@
702 +‰öu\eØ\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤\r\x7fªÂ~·
703 \ No newline at end of file
705 commit 33633e7a1aa31972f125878baf7807be57b1672d
706 Author: Author Name <author@email>
707 Date:   Mon Jan 1 00:00:00 2007 +0000
709     patch modify
711 diff --git a/def b/def
712 index 8baef1b..7d69c2f 100644
713 --- a/def
714 +++ b/def
715 @@ -1 +1,2 @@
716  abc
717 +asjhfksad
719 commit d4850419ccc1146c7169f500725ce504b9774ed0
720 Author: Author Name <author@email>
721 Date:   Mon Jan 1 00:00:00 2007 +0000
723     initial
724     
725     Signed-off-by: Commiter Name <commiter@email>
727 diff --git a/def b/def
728 new file mode 100644
729 index 0000000..8baef1b
730 --- /dev/null
731 +++ b/def
732 @@ -0,0 +1 @@
733 +abc
734 % guilt-pop --all
735 All patches popped.
736 % guilt-push -n -2
737 Invalid number of patches to push.
738 % list_files
739 d .git/patches
740 d .git/patches/master
741 d .git/refs/patches
742 d .git/refs/patches/master
743 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
744 f 413390f3906f16f30b054a4fb86c1e014b964504  .git/patches/master/remove
745 f 9c18cc7abe6b87f18503714a80a677b4094eb457  .git/patches/master/add
746 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
747 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
748 f da39a3ee5e6b4b0d3255bfef95601890afd80709  .git/patches/master/status
749 % git log -p
750 commit d4850419ccc1146c7169f500725ce504b9774ed0
751 Author: Author Name <author@email>
752 Date:   Mon Jan 1 00:00:00 2007 +0000
754     initial
755     
756     Signed-off-by: Commiter Name <commiter@email>
758 diff --git a/def b/def
759 new file mode 100644
760 index 0000000..8baef1b
761 --- /dev/null
762 +++ b/def
763 @@ -0,0 +1 @@
764 +abc
765 % guilt-pop --all
766 No patches applied.
767 % guilt-push -n -1
768 Invalid number of patches to push.
769 % list_files
770 d .git/patches
771 d .git/patches/master
772 d .git/refs/patches
773 d .git/refs/patches/master
774 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
775 f 413390f3906f16f30b054a4fb86c1e014b964504  .git/patches/master/remove
776 f 9c18cc7abe6b87f18503714a80a677b4094eb457  .git/patches/master/add
777 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
778 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
779 f da39a3ee5e6b4b0d3255bfef95601890afd80709  .git/patches/master/status
780 % git log -p
781 commit d4850419ccc1146c7169f500725ce504b9774ed0
782 Author: Author Name <author@email>
783 Date:   Mon Jan 1 00:00:00 2007 +0000
785     initial
786     
787     Signed-off-by: Commiter Name <commiter@email>
789 diff --git a/def b/def
790 new file mode 100644
791 index 0000000..8baef1b
792 --- /dev/null
793 +++ b/def
794 @@ -0,0 +1 @@
795 +abc
796 % guilt-pop --all
797 No patches applied.
798 % guilt-push -n 0
799 Patch is already applied.
800 % list_files
801 d .git/patches
802 d .git/patches/master
803 d .git/refs/patches
804 d .git/refs/patches/master
805 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
806 f 413390f3906f16f30b054a4fb86c1e014b964504  .git/patches/master/remove
807 f 9c18cc7abe6b87f18503714a80a677b4094eb457  .git/patches/master/add
808 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
809 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
810 f da39a3ee5e6b4b0d3255bfef95601890afd80709  .git/patches/master/status
811 % git log -p
812 commit d4850419ccc1146c7169f500725ce504b9774ed0
813 Author: Author Name <author@email>
814 Date:   Mon Jan 1 00:00:00 2007 +0000
816     initial
817     
818     Signed-off-by: Commiter Name <commiter@email>
820 diff --git a/def b/def
821 new file mode 100644
822 index 0000000..8baef1b
823 --- /dev/null
824 +++ b/def
825 @@ -0,0 +1 @@
826 +abc
827 % guilt-pop --all
828 No patches applied.
829 % guilt-push -n 1
830 Applying patch..modify
831 Patch applied.
832 % list_files
833 d .git/patches
834 d .git/patches/master
835 d .git/refs/patches
836 d .git/refs/patches/master
837 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
838 f 413390f3906f16f30b054a4fb86c1e014b964504  .git/patches/master/remove
839 f 7b80669540a0ba5ec6098f50bb7923921278e85a  .git/patches/master/status
840 f 9c18cc7abe6b87f18503714a80a677b4094eb457  .git/patches/master/add
841 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
842 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
843 r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
844 % git log -p
845 commit 33633e7a1aa31972f125878baf7807be57b1672d
846 Author: Author Name <author@email>
847 Date:   Mon Jan 1 00:00:00 2007 +0000
849     patch modify
851 diff --git a/def b/def
852 index 8baef1b..7d69c2f 100644
853 --- a/def
854 +++ b/def
855 @@ -1 +1,2 @@
856  abc
857 +asjhfksad
859 commit d4850419ccc1146c7169f500725ce504b9774ed0
860 Author: Author Name <author@email>
861 Date:   Mon Jan 1 00:00:00 2007 +0000
863     initial
864     
865     Signed-off-by: Commiter Name <commiter@email>
867 diff --git a/def b/def
868 new file mode 100644
869 index 0000000..8baef1b
870 --- /dev/null
871 +++ b/def
872 @@ -0,0 +1 @@
873 +abc
874 % guilt-pop --all
875 All patches popped.
876 % guilt-push -n 2
877 Applying patch..modify
878 Patch applied.
879 Applying patch..add
880 Patch applied.
881 % list_files
882 d .git/patches
883 d .git/patches/master
884 d .git/refs/patches
885 d .git/refs/patches/master
886 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
887 f 413390f3906f16f30b054a4fb86c1e014b964504  .git/patches/master/remove
888 f 6e9645b29c7233ecdf1494834e83c67a37464548  .git/patches/master/status
889 f 9c18cc7abe6b87f18503714a80a677b4094eb457  .git/patches/master/add
890 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
891 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
892 r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
893 r 37d588cc39848368810e88332bd03b083f2ce3ac  .git/refs/patches/master/add
894 % git log -p
895 commit 37d588cc39848368810e88332bd03b083f2ce3ac
896 Author: Author Name <author@email>
897 Date:   Mon Jan 1 00:00:00 2007 +0000
899     patch add
901 diff --git a/abd b/abd
902 new file mode 100644
903 index 0000000..fd3896d
904 --- /dev/null
905 +++ b/abd
906 @@ -0,0 +1 @@
907 +‰öu\eØ\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤\r\x7fªÂ~·
908 \ No newline at end of file
910 commit 33633e7a1aa31972f125878baf7807be57b1672d
911 Author: Author Name <author@email>
912 Date:   Mon Jan 1 00:00:00 2007 +0000
914     patch modify
916 diff --git a/def b/def
917 index 8baef1b..7d69c2f 100644
918 --- a/def
919 +++ b/def
920 @@ -1 +1,2 @@
921  abc
922 +asjhfksad
924 commit d4850419ccc1146c7169f500725ce504b9774ed0
925 Author: Author Name <author@email>
926 Date:   Mon Jan 1 00:00:00 2007 +0000
928     initial
929     
930     Signed-off-by: Commiter Name <commiter@email>
932 diff --git a/def b/def
933 new file mode 100644
934 index 0000000..8baef1b
935 --- /dev/null
936 +++ b/def
937 @@ -0,0 +1 @@
938 +abc
939 % guilt-pop --all
940 All patches popped.
941 % guilt-push -n 3
942 Applying patch..modify
943 Patch applied.
944 Applying patch..add
945 Patch applied.
946 Applying patch..remove
947 Patch applied.
948 % list_files
949 d .git/patches
950 d .git/patches/master
951 d .git/refs/patches
952 d .git/refs/patches/master
953 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
954 f 413390f3906f16f30b054a4fb86c1e014b964504  .git/patches/master/remove
955 f 9c18cc7abe6b87f18503714a80a677b4094eb457  .git/patches/master/add
956 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
957 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
958 f f322f08d907e3737a4321b0ec90bc545f71af7cf  .git/patches/master/status
959 r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
960 r 37d588cc39848368810e88332bd03b083f2ce3ac  .git/refs/patches/master/add
961 r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9  .git/refs/patches/master/remove
962 % git log -p
963 commit ffb7faa126a6d91bcdd44a494f76b96dd860b8b9
964 Author: Author Name <author@email>
965 Date:   Mon Jan 1 00:00:00 2007 +0000
967     patch remove
969 diff --git a/abd b/abd
970 deleted file mode 100644
971 index fd3896d..0000000
972 --- a/abd
973 +++ /dev/null
974 @@ -1 +0,0 @@
975 -‰öu\eØ\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤\r\x7fªÂ~·
976 \ No newline at end of file
978 commit 37d588cc39848368810e88332bd03b083f2ce3ac
979 Author: Author Name <author@email>
980 Date:   Mon Jan 1 00:00:00 2007 +0000
982     patch add
984 diff --git a/abd b/abd
985 new file mode 100644
986 index 0000000..fd3896d
987 --- /dev/null
988 +++ b/abd
989 @@ -0,0 +1 @@
990 +‰öu\eØ\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤\r\x7fªÂ~·
991 \ No newline at end of file
993 commit 33633e7a1aa31972f125878baf7807be57b1672d
994 Author: Author Name <author@email>
995 Date:   Mon Jan 1 00:00:00 2007 +0000
997     patch modify
999 diff --git a/def b/def
1000 index 8baef1b..7d69c2f 100644
1001 --- a/def
1002 +++ b/def
1003 @@ -1 +1,2 @@
1004  abc
1005 +asjhfksad
1007 commit d4850419ccc1146c7169f500725ce504b9774ed0
1008 Author: Author Name <author@email>
1009 Date:   Mon Jan 1 00:00:00 2007 +0000
1011     initial
1012     
1013     Signed-off-by: Commiter Name <commiter@email>
1015 diff --git a/def b/def
1016 new file mode 100644
1017 index 0000000..8baef1b
1018 --- /dev/null
1019 +++ b/def
1020 @@ -0,0 +1 @@
1021 +abc
1022 % guilt-pop --all
1023 All patches popped.
1024 % guilt-push -n 4
1025 Applying patch..modify
1026 Patch applied.
1027 Applying patch..add
1028 Patch applied.
1029 Applying patch..remove
1030 Patch applied.
1031 Applying patch..mode
1032 Patch applied.
1033 % list_files
1034 d .git/patches
1035 d .git/patches/master
1036 d .git/refs/patches
1037 d .git/refs/patches/master
1038 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
1039 f 413390f3906f16f30b054a4fb86c1e014b964504  .git/patches/master/remove
1040 f 71596bf71b72c2717e1aee378aabefbfa19ab7c8  .git/patches/master/status
1041 f 9c18cc7abe6b87f18503714a80a677b4094eb457  .git/patches/master/add
1042 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
1043 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
1044 r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
1045 r 37d588cc39848368810e88332bd03b083f2ce3ac  .git/refs/patches/master/add
1046 r ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba  .git/refs/patches/master/mode
1047 r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9  .git/refs/patches/master/remove
1048 % git log -p
1049 commit ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba
1050 Author: Author Name <author@email>
1051 Date:   Mon Jan 1 00:00:00 2007 +0000
1053     patch mode
1055 diff --git a/def b/def
1056 old mode 100644
1057 new mode 100755
1059 commit ffb7faa126a6d91bcdd44a494f76b96dd860b8b9
1060 Author: Author Name <author@email>
1061 Date:   Mon Jan 1 00:00:00 2007 +0000
1063     patch remove
1065 diff --git a/abd b/abd
1066 deleted file mode 100644
1067 index fd3896d..0000000
1068 --- a/abd
1069 +++ /dev/null
1070 @@ -1 +0,0 @@
1071 -‰öu\eØ\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤\r\x7fªÂ~·
1072 \ No newline at end of file
1074 commit 37d588cc39848368810e88332bd03b083f2ce3ac
1075 Author: Author Name <author@email>
1076 Date:   Mon Jan 1 00:00:00 2007 +0000
1078     patch add
1080 diff --git a/abd b/abd
1081 new file mode 100644
1082 index 0000000..fd3896d
1083 --- /dev/null
1084 +++ b/abd
1085 @@ -0,0 +1 @@
1086 +‰öu\eØ\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤\r\x7fªÂ~·
1087 \ No newline at end of file
1089 commit 33633e7a1aa31972f125878baf7807be57b1672d
1090 Author: Author Name <author@email>
1091 Date:   Mon Jan 1 00:00:00 2007 +0000
1093     patch modify
1095 diff --git a/def b/def
1096 index 8baef1b..7d69c2f 100644
1097 --- a/def
1098 +++ b/def
1099 @@ -1 +1,2 @@
1100  abc
1101 +asjhfksad
1103 commit d4850419ccc1146c7169f500725ce504b9774ed0
1104 Author: Author Name <author@email>
1105 Date:   Mon Jan 1 00:00:00 2007 +0000
1107     initial
1108     
1109     Signed-off-by: Commiter Name <commiter@email>
1111 diff --git a/def b/def
1112 new file mode 100644
1113 index 0000000..8baef1b
1114 --- /dev/null
1115 +++ b/def
1116 @@ -0,0 +1 @@
1117 +abc
1118 % guilt-pop --all
1119 All patches popped.
1120 % list_files
1121 d .git/patches
1122 d .git/patches/master
1123 d .git/refs/patches
1124 d .git/refs/patches/master
1125 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
1126 f 413390f3906f16f30b054a4fb86c1e014b964504  .git/patches/master/remove
1127 f 9c18cc7abe6b87f18503714a80a677b4094eb457  .git/patches/master/add
1128 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
1129 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
1130 f da39a3ee5e6b4b0d3255bfef95601890afd80709  .git/patches/master/status