{diff,import-commit,new}: fix handling of binary files
[guilt/mob.git] / regression / t-021.out
blob4cdd128989ca774e687c8eb27b03ac97cdfac5a5
1 % setup_repo
2 % guilt-push --all
3 Applying patch..modify
4 Patch applied.
5 Applying patch..add
6 Patch applied.
7 Applying patch..remove
8 Patch applied.
9 Applying patch..mode
10 Patch applied.
11 % git log -p
12 commit 632ca0f5ec27a961990b45673dfc751f1da830f3
13 Author: Author Name <author@email>
14 Date:   Mon Jan 1 00:00:00 2007 +0000
16     patch mode
18 diff --git a/def b/def
19 old mode 100644
20 new mode 100755
22 commit e67345cf1e7e9594c73efad7381a994f1fe63b14
23 Author: Author Name <author@email>
24 Date:   Mon Jan 1 00:00:00 2007 +0000
26     patch remove
28 diff --git a/abd b/abd
29 deleted file mode 100644
30 index 489450e..0000000
31 --- a/abd
32 +++ /dev/null
33 @@ -1 +0,0 @@
34 -qweert
36 commit 68f33a015dcfd09c3896f15d152378b54eaa4eb6
37 Author: Author Name <author@email>
38 Date:   Mon Jan 1 00:00:00 2007 +0000
40     patch add
42 diff --git a/abd b/abd
43 new file mode 100644
44 index 0000000..489450e
45 --- /dev/null
46 +++ b/abd
47 @@ -0,0 +1 @@
48 +qweert
50 commit 33633e7a1aa31972f125878baf7807be57b1672d
51 Author: Author Name <author@email>
52 Date:   Mon Jan 1 00:00:00 2007 +0000
54     patch modify
56 diff --git a/def b/def
57 index 8baef1b..7d69c2f 100644
58 --- a/def
59 +++ b/def
60 @@ -1 +1,2 @@
61  abc
62 +asjhfksad
64 commit d4850419ccc1146c7169f500725ce504b9774ed0
65 Author: Author Name <author@email>
66 Date:   Mon Jan 1 00:00:00 2007 +0000
68     initial
69     
70     Signed-off-by: Commiter Name <commiter@email>
72 diff --git a/def b/def
73 new file mode 100644
74 index 0000000..8baef1b
75 --- /dev/null
76 +++ b/def
77 @@ -0,0 +1 @@
78 +abc
79 % guilt-pop
80 Now at remove.
81 % list_files
82 d .git/patches
83 d .git/patches/master
84 d .git/refs/patches
85 d .git/refs/patches/master
86 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
87 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
88 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
89 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
90 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
91 f f322f08d907e3737a4321b0ec90bc545f71af7cf  .git/patches/master/status
92 r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
93 r 68f33a015dcfd09c3896f15d152378b54eaa4eb6  .git/refs/patches/master/add
94 r e67345cf1e7e9594c73efad7381a994f1fe63b14  .git/refs/patches/master/remove
95 % git log -p
96 commit e67345cf1e7e9594c73efad7381a994f1fe63b14
97 Author: Author Name <author@email>
98 Date:   Mon Jan 1 00:00:00 2007 +0000
100     patch remove
102 diff --git a/abd b/abd
103 deleted file mode 100644
104 index 489450e..0000000
105 --- a/abd
106 +++ /dev/null
107 @@ -1 +0,0 @@
108 -qweert
110 commit 68f33a015dcfd09c3896f15d152378b54eaa4eb6
111 Author: Author Name <author@email>
112 Date:   Mon Jan 1 00:00:00 2007 +0000
114     patch add
116 diff --git a/abd b/abd
117 new file mode 100644
118 index 0000000..489450e
119 --- /dev/null
120 +++ b/abd
121 @@ -0,0 +1 @@
122 +qweert
124 commit 33633e7a1aa31972f125878baf7807be57b1672d
125 Author: Author Name <author@email>
126 Date:   Mon Jan 1 00:00:00 2007 +0000
128     patch modify
130 diff --git a/def b/def
131 index 8baef1b..7d69c2f 100644
132 --- a/def
133 +++ b/def
134 @@ -1 +1,2 @@
135  abc
136 +asjhfksad
138 commit d4850419ccc1146c7169f500725ce504b9774ed0
139 Author: Author Name <author@email>
140 Date:   Mon Jan 1 00:00:00 2007 +0000
142     initial
143     
144     Signed-off-by: Commiter Name <commiter@email>
146 diff --git a/def b/def
147 new file mode 100644
148 index 0000000..8baef1b
149 --- /dev/null
150 +++ b/def
151 @@ -0,0 +1 @@
152 +abc
153 % guilt-pop
154 Now at add.
155 % list_files
156 d .git/patches
157 d .git/patches/master
158 d .git/refs/patches
159 d .git/refs/patches/master
160 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
161 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
162 f 6e9645b29c7233ecdf1494834e83c67a37464548  .git/patches/master/status
163 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
164 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
165 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
166 r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
167 r 68f33a015dcfd09c3896f15d152378b54eaa4eb6  .git/refs/patches/master/add
168 % git log -p
169 commit 68f33a015dcfd09c3896f15d152378b54eaa4eb6
170 Author: Author Name <author@email>
171 Date:   Mon Jan 1 00:00:00 2007 +0000
173     patch add
175 diff --git a/abd b/abd
176 new file mode 100644
177 index 0000000..489450e
178 --- /dev/null
179 +++ b/abd
180 @@ -0,0 +1 @@
181 +qweert
183 commit 33633e7a1aa31972f125878baf7807be57b1672d
184 Author: Author Name <author@email>
185 Date:   Mon Jan 1 00:00:00 2007 +0000
187     patch modify
189 diff --git a/def b/def
190 index 8baef1b..7d69c2f 100644
191 --- a/def
192 +++ b/def
193 @@ -1 +1,2 @@
194  abc
195 +asjhfksad
197 commit d4850419ccc1146c7169f500725ce504b9774ed0
198 Author: Author Name <author@email>
199 Date:   Mon Jan 1 00:00:00 2007 +0000
201     initial
202     
203     Signed-off-by: Commiter Name <commiter@email>
205 diff --git a/def b/def
206 new file mode 100644
207 index 0000000..8baef1b
208 --- /dev/null
209 +++ b/def
210 @@ -0,0 +1 @@
211 +abc
212 % guilt-pop
213 Now at modify.
214 % list_files
215 d .git/patches
216 d .git/patches/master
217 d .git/refs/patches
218 d .git/refs/patches/master
219 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
220 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
221 f 7b80669540a0ba5ec6098f50bb7923921278e85a  .git/patches/master/status
222 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
223 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
224 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
225 r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
226 % git log -p
227 commit 33633e7a1aa31972f125878baf7807be57b1672d
228 Author: Author Name <author@email>
229 Date:   Mon Jan 1 00:00:00 2007 +0000
231     patch modify
233 diff --git a/def b/def
234 index 8baef1b..7d69c2f 100644
235 --- a/def
236 +++ b/def
237 @@ -1 +1,2 @@
238  abc
239 +asjhfksad
241 commit d4850419ccc1146c7169f500725ce504b9774ed0
242 Author: Author Name <author@email>
243 Date:   Mon Jan 1 00:00:00 2007 +0000
245     initial
246     
247     Signed-off-by: Commiter Name <commiter@email>
249 diff --git a/def b/def
250 new file mode 100644
251 index 0000000..8baef1b
252 --- /dev/null
253 +++ b/def
254 @@ -0,0 +1 @@
255 +abc
256 % guilt-pop
257 All patches popped.
258 % list_files
259 d .git/patches
260 d .git/patches/master
261 d .git/refs/patches
262 d .git/refs/patches/master
263 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
264 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
265 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
266 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
267 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
268 f da39a3ee5e6b4b0d3255bfef95601890afd80709  .git/patches/master/status
269 % git log -p
270 commit d4850419ccc1146c7169f500725ce504b9774ed0
271 Author: Author Name <author@email>
272 Date:   Mon Jan 1 00:00:00 2007 +0000
274     initial
275     
276     Signed-off-by: Commiter Name <commiter@email>
278 diff --git a/def b/def
279 new file mode 100644
280 index 0000000..8baef1b
281 --- /dev/null
282 +++ b/def
283 @@ -0,0 +1 @@
284 +abc
285 % guilt-push --all
286 Applying patch..modify
287 Patch applied.
288 Applying patch..add
289 Patch applied.
290 Applying patch..remove
291 Patch applied.
292 Applying patch..mode
293 Patch applied.
294 % guilt-pop mode
295 Now at remove.
296 % list_files
297 d .git/patches
298 d .git/patches/master
299 d .git/refs/patches
300 d .git/refs/patches/master
301 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
302 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
303 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
304 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
305 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
306 f f322f08d907e3737a4321b0ec90bc545f71af7cf  .git/patches/master/status
307 r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
308 r 68f33a015dcfd09c3896f15d152378b54eaa4eb6  .git/refs/patches/master/add
309 r e67345cf1e7e9594c73efad7381a994f1fe63b14  .git/refs/patches/master/remove
310 % git log -p
311 commit e67345cf1e7e9594c73efad7381a994f1fe63b14
312 Author: Author Name <author@email>
313 Date:   Mon Jan 1 00:00:00 2007 +0000
315     patch remove
317 diff --git a/abd b/abd
318 deleted file mode 100644
319 index 489450e..0000000
320 --- a/abd
321 +++ /dev/null
322 @@ -1 +0,0 @@
323 -qweert
325 commit 68f33a015dcfd09c3896f15d152378b54eaa4eb6
326 Author: Author Name <author@email>
327 Date:   Mon Jan 1 00:00:00 2007 +0000
329     patch add
331 diff --git a/abd b/abd
332 new file mode 100644
333 index 0000000..489450e
334 --- /dev/null
335 +++ b/abd
336 @@ -0,0 +1 @@
337 +qweert
339 commit 33633e7a1aa31972f125878baf7807be57b1672d
340 Author: Author Name <author@email>
341 Date:   Mon Jan 1 00:00:00 2007 +0000
343     patch modify
345 diff --git a/def b/def
346 index 8baef1b..7d69c2f 100644
347 --- a/def
348 +++ b/def
349 @@ -1 +1,2 @@
350  abc
351 +asjhfksad
353 commit d4850419ccc1146c7169f500725ce504b9774ed0
354 Author: Author Name <author@email>
355 Date:   Mon Jan 1 00:00:00 2007 +0000
357     initial
358     
359     Signed-off-by: Commiter Name <commiter@email>
361 diff --git a/def b/def
362 new file mode 100644
363 index 0000000..8baef1b
364 --- /dev/null
365 +++ b/def
366 @@ -0,0 +1 @@
367 +abc
368 % guilt-push --all
369 Applying patch..mode
370 Patch applied.
371 % guilt-pop remove
372 Now at add.
373 % list_files
374 d .git/patches
375 d .git/patches/master
376 d .git/refs/patches
377 d .git/refs/patches/master
378 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
379 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
380 f 6e9645b29c7233ecdf1494834e83c67a37464548  .git/patches/master/status
381 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
382 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
383 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
384 r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
385 r 68f33a015dcfd09c3896f15d152378b54eaa4eb6  .git/refs/patches/master/add
386 % git log -p
387 commit 68f33a015dcfd09c3896f15d152378b54eaa4eb6
388 Author: Author Name <author@email>
389 Date:   Mon Jan 1 00:00:00 2007 +0000
391     patch add
393 diff --git a/abd b/abd
394 new file mode 100644
395 index 0000000..489450e
396 --- /dev/null
397 +++ b/abd
398 @@ -0,0 +1 @@
399 +qweert
401 commit 33633e7a1aa31972f125878baf7807be57b1672d
402 Author: Author Name <author@email>
403 Date:   Mon Jan 1 00:00:00 2007 +0000
405     patch modify
407 diff --git a/def b/def
408 index 8baef1b..7d69c2f 100644
409 --- a/def
410 +++ b/def
411 @@ -1 +1,2 @@
412  abc
413 +asjhfksad
415 commit d4850419ccc1146c7169f500725ce504b9774ed0
416 Author: Author Name <author@email>
417 Date:   Mon Jan 1 00:00:00 2007 +0000
419     initial
420     
421     Signed-off-by: Commiter Name <commiter@email>
423 diff --git a/def b/def
424 new file mode 100644
425 index 0000000..8baef1b
426 --- /dev/null
427 +++ b/def
428 @@ -0,0 +1 @@
429 +abc
430 % guilt-push --all
431 Applying patch..remove
432 Patch applied.
433 Applying patch..mode
434 Patch applied.
435 % guilt-pop add
436 Now at modify.
437 % list_files
438 d .git/patches
439 d .git/patches/master
440 d .git/refs/patches
441 d .git/refs/patches/master
442 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
443 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
444 f 7b80669540a0ba5ec6098f50bb7923921278e85a  .git/patches/master/status
445 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
446 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
447 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
448 r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
449 % git log -p
450 commit 33633e7a1aa31972f125878baf7807be57b1672d
451 Author: Author Name <author@email>
452 Date:   Mon Jan 1 00:00:00 2007 +0000
454     patch modify
456 diff --git a/def b/def
457 index 8baef1b..7d69c2f 100644
458 --- a/def
459 +++ b/def
460 @@ -1 +1,2 @@
461  abc
462 +asjhfksad
464 commit d4850419ccc1146c7169f500725ce504b9774ed0
465 Author: Author Name <author@email>
466 Date:   Mon Jan 1 00:00:00 2007 +0000
468     initial
469     
470     Signed-off-by: Commiter Name <commiter@email>
472 diff --git a/def b/def
473 new file mode 100644
474 index 0000000..8baef1b
475 --- /dev/null
476 +++ b/def
477 @@ -0,0 +1 @@
478 +abc
479 % guilt-push --all
480 Applying patch..add
481 Patch applied.
482 Applying patch..remove
483 Patch applied.
484 Applying patch..mode
485 Patch applied.
486 % guilt-pop modify
487 All patches popped.
488 % list_files
489 d .git/patches
490 d .git/patches/master
491 d .git/refs/patches
492 d .git/refs/patches/master
493 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
494 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
495 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
496 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
497 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
498 f da39a3ee5e6b4b0d3255bfef95601890afd80709  .git/patches/master/status
499 % git log -p
500 commit d4850419ccc1146c7169f500725ce504b9774ed0
501 Author: Author Name <author@email>
502 Date:   Mon Jan 1 00:00:00 2007 +0000
504     initial
505     
506     Signed-off-by: Commiter Name <commiter@email>
508 diff --git a/def b/def
509 new file mode 100644
510 index 0000000..8baef1b
511 --- /dev/null
512 +++ b/def
513 @@ -0,0 +1 @@
514 +abc
515 % guilt-push --all
516 Applying patch..modify
517 Patch applied.
518 Applying patch..add
519 Patch applied.
520 Applying patch..remove
521 Patch applied.
522 Applying patch..mode
523 Patch applied.
524 % guilt-pop
525 Now at remove.
526 % list_files
527 d .git/patches
528 d .git/patches/master
529 d .git/refs/patches
530 d .git/refs/patches/master
531 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
532 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
533 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
534 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
535 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
536 f f322f08d907e3737a4321b0ec90bc545f71af7cf  .git/patches/master/status
537 r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
538 r 68f33a015dcfd09c3896f15d152378b54eaa4eb6  .git/refs/patches/master/add
539 r e67345cf1e7e9594c73efad7381a994f1fe63b14  .git/refs/patches/master/remove
540 % git log -p
541 commit e67345cf1e7e9594c73efad7381a994f1fe63b14
542 Author: Author Name <author@email>
543 Date:   Mon Jan 1 00:00:00 2007 +0000
545     patch remove
547 diff --git a/abd b/abd
548 deleted file mode 100644
549 index 489450e..0000000
550 --- a/abd
551 +++ /dev/null
552 @@ -1 +0,0 @@
553 -qweert
555 commit 68f33a015dcfd09c3896f15d152378b54eaa4eb6
556 Author: Author Name <author@email>
557 Date:   Mon Jan 1 00:00:00 2007 +0000
559     patch add
561 diff --git a/abd b/abd
562 new file mode 100644
563 index 0000000..489450e
564 --- /dev/null
565 +++ b/abd
566 @@ -0,0 +1 @@
567 +qweert
569 commit 33633e7a1aa31972f125878baf7807be57b1672d
570 Author: Author Name <author@email>
571 Date:   Mon Jan 1 00:00:00 2007 +0000
573     patch modify
575 diff --git a/def b/def
576 index 8baef1b..7d69c2f 100644
577 --- a/def
578 +++ b/def
579 @@ -1 +1,2 @@
580  abc
581 +asjhfksad
583 commit d4850419ccc1146c7169f500725ce504b9774ed0
584 Author: Author Name <author@email>
585 Date:   Mon Jan 1 00:00:00 2007 +0000
587     initial
588     
589     Signed-off-by: Commiter Name <commiter@email>
591 diff --git a/def b/def
592 new file mode 100644
593 index 0000000..8baef1b
594 --- /dev/null
595 +++ b/def
596 @@ -0,0 +1 @@
597 +abc
598 % guilt-pop
599 Now at add.
600 % list_files
601 d .git/patches
602 d .git/patches/master
603 d .git/refs/patches
604 d .git/refs/patches/master
605 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
606 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
607 f 6e9645b29c7233ecdf1494834e83c67a37464548  .git/patches/master/status
608 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
609 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
610 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
611 r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
612 r 68f33a015dcfd09c3896f15d152378b54eaa4eb6  .git/refs/patches/master/add
613 % git log -p
614 commit 68f33a015dcfd09c3896f15d152378b54eaa4eb6
615 Author: Author Name <author@email>
616 Date:   Mon Jan 1 00:00:00 2007 +0000
618     patch add
620 diff --git a/abd b/abd
621 new file mode 100644
622 index 0000000..489450e
623 --- /dev/null
624 +++ b/abd
625 @@ -0,0 +1 @@
626 +qweert
628 commit 33633e7a1aa31972f125878baf7807be57b1672d
629 Author: Author Name <author@email>
630 Date:   Mon Jan 1 00:00:00 2007 +0000
632     patch modify
634 diff --git a/def b/def
635 index 8baef1b..7d69c2f 100644
636 --- a/def
637 +++ b/def
638 @@ -1 +1,2 @@
639  abc
640 +asjhfksad
642 commit d4850419ccc1146c7169f500725ce504b9774ed0
643 Author: Author Name <author@email>
644 Date:   Mon Jan 1 00:00:00 2007 +0000
646     initial
647     
648     Signed-off-by: Commiter Name <commiter@email>
650 diff --git a/def b/def
651 new file mode 100644
652 index 0000000..8baef1b
653 --- /dev/null
654 +++ b/def
655 @@ -0,0 +1 @@
656 +abc
657 % guilt-pop
658 Now at modify.
659 % list_files
660 d .git/patches
661 d .git/patches/master
662 d .git/refs/patches
663 d .git/refs/patches/master
664 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
665 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
666 f 7b80669540a0ba5ec6098f50bb7923921278e85a  .git/patches/master/status
667 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
668 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
669 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
670 r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
671 % git log -p
672 commit 33633e7a1aa31972f125878baf7807be57b1672d
673 Author: Author Name <author@email>
674 Date:   Mon Jan 1 00:00:00 2007 +0000
676     patch modify
678 diff --git a/def b/def
679 index 8baef1b..7d69c2f 100644
680 --- a/def
681 +++ b/def
682 @@ -1 +1,2 @@
683  abc
684 +asjhfksad
686 commit d4850419ccc1146c7169f500725ce504b9774ed0
687 Author: Author Name <author@email>
688 Date:   Mon Jan 1 00:00:00 2007 +0000
690     initial
691     
692     Signed-off-by: Commiter Name <commiter@email>
694 diff --git a/def b/def
695 new file mode 100644
696 index 0000000..8baef1b
697 --- /dev/null
698 +++ b/def
699 @@ -0,0 +1 @@
700 +abc
701 % guilt-pop
702 All patches popped.
703 % list_files
704 d .git/patches
705 d .git/patches/master
706 d .git/refs/patches
707 d .git/refs/patches/master
708 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
709 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
710 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
711 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
712 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
713 f da39a3ee5e6b4b0d3255bfef95601890afd80709  .git/patches/master/status
714 % git log -p
715 commit d4850419ccc1146c7169f500725ce504b9774ed0
716 Author: Author Name <author@email>
717 Date:   Mon Jan 1 00:00:00 2007 +0000
719     initial
720     
721     Signed-off-by: Commiter Name <commiter@email>
723 diff --git a/def b/def
724 new file mode 100644
725 index 0000000..8baef1b
726 --- /dev/null
727 +++ b/def
728 @@ -0,0 +1 @@
729 +abc
730 % guilt-push --all
731 Applying patch..modify
732 Patch applied.
733 Applying patch..add
734 Patch applied.
735 Applying patch..remove
736 Patch applied.
737 Applying patch..mode
738 Patch applied.
739 % guilt-pop -n -2
740 Invalid number of patches to pop.
741 % list_files
742 d .git/patches
743 d .git/patches/master
744 d .git/refs/patches
745 d .git/refs/patches/master
746 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
747 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
748 f 71596bf71b72c2717e1aee378aabefbfa19ab7c8  .git/patches/master/status
749 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
750 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
751 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
752 r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
753 r 632ca0f5ec27a961990b45673dfc751f1da830f3  .git/refs/patches/master/mode
754 r 68f33a015dcfd09c3896f15d152378b54eaa4eb6  .git/refs/patches/master/add
755 r e67345cf1e7e9594c73efad7381a994f1fe63b14  .git/refs/patches/master/remove
756 % git log -p
757 commit 632ca0f5ec27a961990b45673dfc751f1da830f3
758 Author: Author Name <author@email>
759 Date:   Mon Jan 1 00:00:00 2007 +0000
761     patch mode
763 diff --git a/def b/def
764 old mode 100644
765 new mode 100755
767 commit e67345cf1e7e9594c73efad7381a994f1fe63b14
768 Author: Author Name <author@email>
769 Date:   Mon Jan 1 00:00:00 2007 +0000
771     patch remove
773 diff --git a/abd b/abd
774 deleted file mode 100644
775 index 489450e..0000000
776 --- a/abd
777 +++ /dev/null
778 @@ -1 +0,0 @@
779 -qweert
781 commit 68f33a015dcfd09c3896f15d152378b54eaa4eb6
782 Author: Author Name <author@email>
783 Date:   Mon Jan 1 00:00:00 2007 +0000
785     patch add
787 diff --git a/abd b/abd
788 new file mode 100644
789 index 0000000..489450e
790 --- /dev/null
791 +++ b/abd
792 @@ -0,0 +1 @@
793 +qweert
795 commit 33633e7a1aa31972f125878baf7807be57b1672d
796 Author: Author Name <author@email>
797 Date:   Mon Jan 1 00:00:00 2007 +0000
799     patch modify
801 diff --git a/def b/def
802 index 8baef1b..7d69c2f 100644
803 --- a/def
804 +++ b/def
805 @@ -1 +1,2 @@
806  abc
807 +asjhfksad
809 commit d4850419ccc1146c7169f500725ce504b9774ed0
810 Author: Author Name <author@email>
811 Date:   Mon Jan 1 00:00:00 2007 +0000
813     initial
814     
815     Signed-off-by: Commiter Name <commiter@email>
817 diff --git a/def b/def
818 new file mode 100644
819 index 0000000..8baef1b
820 --- /dev/null
821 +++ b/def
822 @@ -0,0 +1 @@
823 +abc
824 % guilt-push --all
825 File series fully applied, ends at patch mode
826 % guilt-pop -n -1
827 Invalid number of patches to pop.
828 % list_files
829 d .git/patches
830 d .git/patches/master
831 d .git/refs/patches
832 d .git/refs/patches/master
833 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
834 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
835 f 71596bf71b72c2717e1aee378aabefbfa19ab7c8  .git/patches/master/status
836 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
837 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
838 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
839 r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
840 r 632ca0f5ec27a961990b45673dfc751f1da830f3  .git/refs/patches/master/mode
841 r 68f33a015dcfd09c3896f15d152378b54eaa4eb6  .git/refs/patches/master/add
842 r e67345cf1e7e9594c73efad7381a994f1fe63b14  .git/refs/patches/master/remove
843 % git log -p
844 commit 632ca0f5ec27a961990b45673dfc751f1da830f3
845 Author: Author Name <author@email>
846 Date:   Mon Jan 1 00:00:00 2007 +0000
848     patch mode
850 diff --git a/def b/def
851 old mode 100644
852 new mode 100755
854 commit e67345cf1e7e9594c73efad7381a994f1fe63b14
855 Author: Author Name <author@email>
856 Date:   Mon Jan 1 00:00:00 2007 +0000
858     patch remove
860 diff --git a/abd b/abd
861 deleted file mode 100644
862 index 489450e..0000000
863 --- a/abd
864 +++ /dev/null
865 @@ -1 +0,0 @@
866 -qweert
868 commit 68f33a015dcfd09c3896f15d152378b54eaa4eb6
869 Author: Author Name <author@email>
870 Date:   Mon Jan 1 00:00:00 2007 +0000
872     patch add
874 diff --git a/abd b/abd
875 new file mode 100644
876 index 0000000..489450e
877 --- /dev/null
878 +++ b/abd
879 @@ -0,0 +1 @@
880 +qweert
882 commit 33633e7a1aa31972f125878baf7807be57b1672d
883 Author: Author Name <author@email>
884 Date:   Mon Jan 1 00:00:00 2007 +0000
886     patch modify
888 diff --git a/def b/def
889 index 8baef1b..7d69c2f 100644
890 --- a/def
891 +++ b/def
892 @@ -1 +1,2 @@
893  abc
894 +asjhfksad
896 commit d4850419ccc1146c7169f500725ce504b9774ed0
897 Author: Author Name <author@email>
898 Date:   Mon Jan 1 00:00:00 2007 +0000
900     initial
901     
902     Signed-off-by: Commiter Name <commiter@email>
904 diff --git a/def b/def
905 new file mode 100644
906 index 0000000..8baef1b
907 --- /dev/null
908 +++ b/def
909 @@ -0,0 +1 @@
910 +abc
911 % guilt-push --all
912 File series fully applied, ends at patch mode
913 % guilt-pop -n 0
914 No patches requested to be removed.
915 % list_files
916 d .git/patches
917 d .git/patches/master
918 d .git/refs/patches
919 d .git/refs/patches/master
920 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
921 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
922 f 71596bf71b72c2717e1aee378aabefbfa19ab7c8  .git/patches/master/status
923 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
924 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
925 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
926 r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
927 r 632ca0f5ec27a961990b45673dfc751f1da830f3  .git/refs/patches/master/mode
928 r 68f33a015dcfd09c3896f15d152378b54eaa4eb6  .git/refs/patches/master/add
929 r e67345cf1e7e9594c73efad7381a994f1fe63b14  .git/refs/patches/master/remove
930 % git log -p
931 commit 632ca0f5ec27a961990b45673dfc751f1da830f3
932 Author: Author Name <author@email>
933 Date:   Mon Jan 1 00:00:00 2007 +0000
935     patch mode
937 diff --git a/def b/def
938 old mode 100644
939 new mode 100755
941 commit e67345cf1e7e9594c73efad7381a994f1fe63b14
942 Author: Author Name <author@email>
943 Date:   Mon Jan 1 00:00:00 2007 +0000
945     patch remove
947 diff --git a/abd b/abd
948 deleted file mode 100644
949 index 489450e..0000000
950 --- a/abd
951 +++ /dev/null
952 @@ -1 +0,0 @@
953 -qweert
955 commit 68f33a015dcfd09c3896f15d152378b54eaa4eb6
956 Author: Author Name <author@email>
957 Date:   Mon Jan 1 00:00:00 2007 +0000
959     patch add
961 diff --git a/abd b/abd
962 new file mode 100644
963 index 0000000..489450e
964 --- /dev/null
965 +++ b/abd
966 @@ -0,0 +1 @@
967 +qweert
969 commit 33633e7a1aa31972f125878baf7807be57b1672d
970 Author: Author Name <author@email>
971 Date:   Mon Jan 1 00:00:00 2007 +0000
973     patch modify
975 diff --git a/def b/def
976 index 8baef1b..7d69c2f 100644
977 --- a/def
978 +++ b/def
979 @@ -1 +1,2 @@
980  abc
981 +asjhfksad
983 commit d4850419ccc1146c7169f500725ce504b9774ed0
984 Author: Author Name <author@email>
985 Date:   Mon Jan 1 00:00:00 2007 +0000
987     initial
988     
989     Signed-off-by: Commiter Name <commiter@email>
991 diff --git a/def b/def
992 new file mode 100644
993 index 0000000..8baef1b
994 --- /dev/null
995 +++ b/def
996 @@ -0,0 +1 @@
997 +abc
998 % guilt-push --all
999 File series fully applied, ends at patch mode
1000 % guilt-pop -n 1
1001 Now at remove.
1002 % list_files
1003 d .git/patches
1004 d .git/patches/master
1005 d .git/refs/patches
1006 d .git/refs/patches/master
1007 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
1008 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
1009 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
1010 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
1011 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
1012 f f322f08d907e3737a4321b0ec90bc545f71af7cf  .git/patches/master/status
1013 r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
1014 r 68f33a015dcfd09c3896f15d152378b54eaa4eb6  .git/refs/patches/master/add
1015 r e67345cf1e7e9594c73efad7381a994f1fe63b14  .git/refs/patches/master/remove
1016 % git log -p
1017 commit e67345cf1e7e9594c73efad7381a994f1fe63b14
1018 Author: Author Name <author@email>
1019 Date:   Mon Jan 1 00:00:00 2007 +0000
1021     patch remove
1023 diff --git a/abd b/abd
1024 deleted file mode 100644
1025 index 489450e..0000000
1026 --- a/abd
1027 +++ /dev/null
1028 @@ -1 +0,0 @@
1029 -qweert
1031 commit 68f33a015dcfd09c3896f15d152378b54eaa4eb6
1032 Author: Author Name <author@email>
1033 Date:   Mon Jan 1 00:00:00 2007 +0000
1035     patch add
1037 diff --git a/abd b/abd
1038 new file mode 100644
1039 index 0000000..489450e
1040 --- /dev/null
1041 +++ b/abd
1042 @@ -0,0 +1 @@
1043 +qweert
1045 commit 33633e7a1aa31972f125878baf7807be57b1672d
1046 Author: Author Name <author@email>
1047 Date:   Mon Jan 1 00:00:00 2007 +0000
1049     patch modify
1051 diff --git a/def b/def
1052 index 8baef1b..7d69c2f 100644
1053 --- a/def
1054 +++ b/def
1055 @@ -1 +1,2 @@
1056  abc
1057 +asjhfksad
1059 commit d4850419ccc1146c7169f500725ce504b9774ed0
1060 Author: Author Name <author@email>
1061 Date:   Mon Jan 1 00:00:00 2007 +0000
1063     initial
1064     
1065     Signed-off-by: Commiter Name <commiter@email>
1067 diff --git a/def b/def
1068 new file mode 100644
1069 index 0000000..8baef1b
1070 --- /dev/null
1071 +++ b/def
1072 @@ -0,0 +1 @@
1073 +abc
1074 % guilt-push --all
1075 Applying patch..mode
1076 Patch applied.
1077 % guilt-pop -n 2
1078 Now at add.
1079 % list_files
1080 d .git/patches
1081 d .git/patches/master
1082 d .git/refs/patches
1083 d .git/refs/patches/master
1084 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
1085 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
1086 f 6e9645b29c7233ecdf1494834e83c67a37464548  .git/patches/master/status
1087 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
1088 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
1089 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
1090 r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
1091 r 68f33a015dcfd09c3896f15d152378b54eaa4eb6  .git/refs/patches/master/add
1092 % git log -p
1093 commit 68f33a015dcfd09c3896f15d152378b54eaa4eb6
1094 Author: Author Name <author@email>
1095 Date:   Mon Jan 1 00:00:00 2007 +0000
1097     patch add
1099 diff --git a/abd b/abd
1100 new file mode 100644
1101 index 0000000..489450e
1102 --- /dev/null
1103 +++ b/abd
1104 @@ -0,0 +1 @@
1105 +qweert
1107 commit 33633e7a1aa31972f125878baf7807be57b1672d
1108 Author: Author Name <author@email>
1109 Date:   Mon Jan 1 00:00:00 2007 +0000
1111     patch modify
1113 diff --git a/def b/def
1114 index 8baef1b..7d69c2f 100644
1115 --- a/def
1116 +++ b/def
1117 @@ -1 +1,2 @@
1118  abc
1119 +asjhfksad
1121 commit d4850419ccc1146c7169f500725ce504b9774ed0
1122 Author: Author Name <author@email>
1123 Date:   Mon Jan 1 00:00:00 2007 +0000
1125     initial
1126     
1127     Signed-off-by: Commiter Name <commiter@email>
1129 diff --git a/def b/def
1130 new file mode 100644
1131 index 0000000..8baef1b
1132 --- /dev/null
1133 +++ b/def
1134 @@ -0,0 +1 @@
1135 +abc
1136 % guilt-push --all
1137 Applying patch..remove
1138 Patch applied.
1139 Applying patch..mode
1140 Patch applied.
1141 % guilt-pop -n 3
1142 Now at modify.
1143 % list_files
1144 d .git/patches
1145 d .git/patches/master
1146 d .git/refs/patches
1147 d .git/refs/patches/master
1148 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
1149 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
1150 f 7b80669540a0ba5ec6098f50bb7923921278e85a  .git/patches/master/status
1151 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
1152 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
1153 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
1154 r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
1155 % git log -p
1156 commit 33633e7a1aa31972f125878baf7807be57b1672d
1157 Author: Author Name <author@email>
1158 Date:   Mon Jan 1 00:00:00 2007 +0000
1160     patch modify
1162 diff --git a/def b/def
1163 index 8baef1b..7d69c2f 100644
1164 --- a/def
1165 +++ b/def
1166 @@ -1 +1,2 @@
1167  abc
1168 +asjhfksad
1170 commit d4850419ccc1146c7169f500725ce504b9774ed0
1171 Author: Author Name <author@email>
1172 Date:   Mon Jan 1 00:00:00 2007 +0000
1174     initial
1175     
1176     Signed-off-by: Commiter Name <commiter@email>
1178 diff --git a/def b/def
1179 new file mode 100644
1180 index 0000000..8baef1b
1181 --- /dev/null
1182 +++ b/def
1183 @@ -0,0 +1 @@
1184 +abc
1185 % guilt-push --all
1186 Applying patch..add
1187 Patch applied.
1188 Applying patch..remove
1189 Patch applied.
1190 Applying patch..mode
1191 Patch applied.
1192 % guilt-pop -n 4
1193 All patches popped.
1194 % list_files
1195 d .git/patches
1196 d .git/patches/master
1197 d .git/refs/patches
1198 d .git/refs/patches/master
1199 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
1200 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
1201 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
1202 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
1203 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
1204 f da39a3ee5e6b4b0d3255bfef95601890afd80709  .git/patches/master/status
1205 % git log -p
1206 commit d4850419ccc1146c7169f500725ce504b9774ed0
1207 Author: Author Name <author@email>
1208 Date:   Mon Jan 1 00:00:00 2007 +0000
1210     initial
1211     
1212     Signed-off-by: Commiter Name <commiter@email>
1214 diff --git a/def b/def
1215 new file mode 100644
1216 index 0000000..8baef1b
1217 --- /dev/null
1218 +++ b/def
1219 @@ -0,0 +1 @@
1220 +abc
1221 % guilt-push --all
1222 Applying patch..modify
1223 Patch applied.
1224 Applying patch..add
1225 Patch applied.
1226 Applying patch..remove
1227 Patch applied.
1228 Applying patch..mode
1229 Patch applied.
1230 % list_files
1231 d .git/patches
1232 d .git/patches/master
1233 d .git/refs/patches
1234 d .git/refs/patches/master
1235 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
1236 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
1237 f 71596bf71b72c2717e1aee378aabefbfa19ab7c8  .git/patches/master/status
1238 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
1239 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
1240 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
1241 r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
1242 r 632ca0f5ec27a961990b45673dfc751f1da830f3  .git/refs/patches/master/mode
1243 r 68f33a015dcfd09c3896f15d152378b54eaa4eb6  .git/refs/patches/master/add
1244 r e67345cf1e7e9594c73efad7381a994f1fe63b14  .git/refs/patches/master/remove