git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [GUILT v3 31/31] Don't use "git log -p" in the test suite.

From
JSJeff Sipek <jeffpc@josefsipek.net>
Date
May 16, 2014, 15:36 UTC
Message-ID
<20140516153608.GH1770@meili.valhalla.31bits.net>
In-Reply-To
<1400251578-17221-32-git-send-email-cederp@opera.com>
Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
On Fri, May 16, 2014 at 04:46:18PM +0200, Per Cederqvist wrote:
Show 2426 quoted lines
> The exact format of "git log -p" may change due to user configuration,
> and even if the test suite can try to set all configuration that
> influences the format explicitly it is hard to guard against future
> changes in git.  Since we already run "cmd list_files" immediately
> before all instances of running "git log -p", we are still assured
> that the history contains what we expect.
> 
> There was one instance in t-021.sh where "cmd git log -p" were not
> preceded by "cmd list_files".
> 
> Signed-off-by: Per Cederqvist <cederp@opera.com>
> ---
>  regression/t-020.out | 1000 --------------------------------------------------
>  regression/t-020.sh  |   16 -
>  regression/t-021.out |  899 +--------------------------------------------
>  regression/t-021.sh  |   10 +-
>  4 files changed, 16 insertions(+), 1909 deletions(-)
> 
> diff --git a/regression/t-020.out b/regression/t-020.out
> index bcb8797..5d7c918 100644
> --- a/regression/t-020.out
> +++ b/regression/t-020.out
> @@ -14,36 +14,6 @@ f 9c18cc7abe6b87f18503714a80a677b4094eb457  .git/patches/master/add
>  f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
>  f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
>  r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
> -% git log -p
> -commit 33633e7a1aa31972f125878baf7807be57b1672d
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch modify
> -
> -diff --git a/def b/def
> -index 8baef1b..7d69c2f 100644
> ---- a/def
> -+++ b/def
> -@@ -1 +1,2 @@
> - abc
> -+asjhfksad
> -
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % guilt push
>  Applying patch..add
>  Patch applied.
> @@ -60,51 +30,6 @@ f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
>  f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
>  r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
>  r 37d588cc39848368810e88332bd03b083f2ce3ac  .git/refs/patches/master/add
> -% git log -p
> -commit 37d588cc39848368810e88332bd03b083f2ce3ac
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch add
> -
> -diff --git a/abd b/abd
> -new file mode 100644
> -index 0000000..fd3896d
> ---- /dev/null
> -+++ b/abd
> -@@ -0,0 +1 @@
> -+��u���Z��e��E��W�V�/�U?�<|�@6�8'H�1G_�ͧ*��Rҙ�
> ��~�
> -\ No newline at end of file
> -
> -commit 33633e7a1aa31972f125878baf7807be57b1672d
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch modify
> -
> -diff --git a/def b/def
> -index 8baef1b..7d69c2f 100644
> ---- a/def
> -+++ b/def
> -@@ -1 +1,2 @@
> - abc
> -+asjhfksad
> -
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % guilt push
>  Applying patch..remove
>  Patch applied.
> @@ -122,66 +47,6 @@ f f322f08d907e3737a4321b0ec90bc545f71af7cf  .git/patches/master/status
>  r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
>  r 37d588cc39848368810e88332bd03b083f2ce3ac  .git/refs/patches/master/add
>  r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9  .git/refs/patches/master/remove
> -% git log -p
> -commit ffb7faa126a6d91bcdd44a494f76b96dd860b8b9
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch remove
> -
> -diff --git a/abd b/abd
> -deleted file mode 100644
> -index fd3896d..0000000
> ---- a/abd
> -+++ /dev/null
> -@@ -1 +0,0 @@
> --��u���Z��e��E��W�V�/�U?�<|�@6�8'H�1G_�ͧ*��Rҙ�
> ��~�
> -\ No newline at end of file
> -
> -commit 37d588cc39848368810e88332bd03b083f2ce3ac
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch add
> -
> -diff --git a/abd b/abd
> -new file mode 100644
> -index 0000000..fd3896d
> ---- /dev/null
> -+++ b/abd
> -@@ -0,0 +1 @@
> -+��u���Z��e��E��W�V�/�U?�<|�@6�8'H�1G_�ͧ*��Rҙ�
> ��~�
> -\ No newline at end of file
> -
> -commit 33633e7a1aa31972f125878baf7807be57b1672d
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch modify
> -
> -diff --git a/def b/def
> -index 8baef1b..7d69c2f 100644
> ---- a/def
> -+++ b/def
> -@@ -1 +1,2 @@
> - abc
> -+asjhfksad
> -
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % guilt push
>  Applying patch..mode
>  Patch applied.
> @@ -200,76 +65,6 @@ r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
>  r 37d588cc39848368810e88332bd03b083f2ce3ac  .git/refs/patches/master/add
>  r ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba  .git/refs/patches/master/mode
>  r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9  .git/refs/patches/master/remove
> -% git log -p
> -commit ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch mode
> -
> -diff --git a/def b/def
> -old mode 100644
> -new mode 100755
> -
> -commit ffb7faa126a6d91bcdd44a494f76b96dd860b8b9
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch remove
> -
> -diff --git a/abd b/abd
> -deleted file mode 100644
> -index fd3896d..0000000
> ---- a/abd
> -+++ /dev/null
> -@@ -1 +0,0 @@
> --��u���Z��e��E��W�V�/�U?�<|�@6�8'H�1G_�ͧ*��Rҙ�
> ��~�
> -\ No newline at end of file
> -
> -commit 37d588cc39848368810e88332bd03b083f2ce3ac
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch add
> -
> -diff --git a/abd b/abd
> -new file mode 100644
> -index 0000000..fd3896d
> ---- /dev/null
> -+++ b/abd
> -@@ -0,0 +1 @@
> -+��u���Z��e��E��W�V�/�U?�<|�@6�8'H�1G_�ͧ*��Rҙ�
> ��~�
> -\ No newline at end of file
> -
> -commit 33633e7a1aa31972f125878baf7807be57b1672d
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch modify
> -
> -diff --git a/def b/def
> -index 8baef1b..7d69c2f 100644
> ---- a/def
> -+++ b/def
> -@@ -1 +1,2 @@
> - abc
> -+asjhfksad
> -
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % guilt push
>  File series fully applied, ends at patch mode
>  % guilt push -a
> @@ -289,76 +84,6 @@ r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
>  r 37d588cc39848368810e88332bd03b083f2ce3ac  .git/refs/patches/master/add
>  r ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba  .git/refs/patches/master/mode
>  r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9  .git/refs/patches/master/remove
> -% git log -p
> -commit ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch mode
> -
> -diff --git a/def b/def
> -old mode 100644
> -new mode 100755
> -
> -commit ffb7faa126a6d91bcdd44a494f76b96dd860b8b9
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch remove
> -
> -diff --git a/abd b/abd
> -deleted file mode 100644
> -index fd3896d..0000000
> ---- a/abd
> -+++ /dev/null
> -@@ -1 +0,0 @@
> --��u���Z��e��E��W�V�/�U?�<|�@6�8'H�1G_�ͧ*��Rҙ�
> ��~�
> -\ No newline at end of file
> -
> -commit 37d588cc39848368810e88332bd03b083f2ce3ac
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch add
> -
> -diff --git a/abd b/abd
> -new file mode 100644
> -index 0000000..fd3896d
> ---- /dev/null
> -+++ b/abd
> -@@ -0,0 +1 @@
> -+��u���Z��e��E��W�V�/�U?�<|�@6�8'H�1G_�ͧ*��Rҙ�
> ��~�
> -\ No newline at end of file
> -
> -commit 33633e7a1aa31972f125878baf7807be57b1672d
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch modify
> -
> -diff --git a/def b/def
> -index 8baef1b..7d69c2f 100644
> ---- a/def
> -+++ b/def
> -@@ -1 +1,2 @@
> - abc
> -+asjhfksad
> -
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % guilt pop --all
>  All patches popped.
>  % guilt push
> @@ -376,36 +101,6 @@ f 9c18cc7abe6b87f18503714a80a677b4094eb457  .git/patches/master/add
>  f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
>  f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
>  r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
> -% git log -p
> -commit 33633e7a1aa31972f125878baf7807be57b1672d
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch modify
> -
> -diff --git a/def b/def
> -index 8baef1b..7d69c2f 100644
> ---- a/def
> -+++ b/def
> -@@ -1 +1,2 @@
> - abc
> -+asjhfksad
> -
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % guilt pop --all
>  All patches popped.
>  % guilt push
> @@ -423,36 +118,6 @@ f 9c18cc7abe6b87f18503714a80a677b4094eb457  .git/patches/master/add
>  f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
>  f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
>  r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
> -% git log -p
> -commit 33633e7a1aa31972f125878baf7807be57b1672d
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch modify
> -
> -diff --git a/def b/def
> -index 8baef1b..7d69c2f 100644
> ---- a/def
> -+++ b/def
> -@@ -1 +1,2 @@
> - abc
> -+asjhfksad
> -
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % guilt pop --all
>  All patches popped.
>  % guilt push
> @@ -470,36 +135,6 @@ f 9c18cc7abe6b87f18503714a80a677b4094eb457  .git/patches/master/add
>  f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
>  f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
>  r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
> -% git log -p
> -commit 33633e7a1aa31972f125878baf7807be57b1672d
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch modify
> -
> -diff --git a/def b/def
> -index 8baef1b..7d69c2f 100644
> ---- a/def
> -+++ b/def
> -@@ -1 +1,2 @@
> - abc
> -+asjhfksad
> -
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % guilt pop --all
>  All patches popped.
>  % guilt push
> @@ -517,36 +152,6 @@ f 9c18cc7abe6b87f18503714a80a677b4094eb457  .git/patches/master/add
>  f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
>  f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
>  r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
> -% git log -p
> -commit 33633e7a1aa31972f125878baf7807be57b1672d
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch modify
> -
> -diff --git a/def b/def
> -index 8baef1b..7d69c2f 100644
> ---- a/def
> -+++ b/def
> -@@ -1 +1,2 @@
> - abc
> -+asjhfksad
> -
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % guilt pop --all
>  All patches popped.
>  % guilt push
> @@ -564,36 +169,6 @@ f 9c18cc7abe6b87f18503714a80a677b4094eb457  .git/patches/master/add
>  f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
>  f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
>  r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
> -% git log -p
> -commit 33633e7a1aa31972f125878baf7807be57b1672d
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch modify
> -
> -diff --git a/def b/def
> -index 8baef1b..7d69c2f 100644
> ---- a/def
> -+++ b/def
> -@@ -1 +1,2 @@
> - abc
> -+asjhfksad
> -
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % guilt push
>  Applying patch..add
>  Patch applied.
> @@ -610,51 +185,6 @@ f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
>  f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
>  r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
>  r 37d588cc39848368810e88332bd03b083f2ce3ac  .git/refs/patches/master/add
> -% git log -p
> -commit 37d588cc39848368810e88332bd03b083f2ce3ac
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch add
> -
> -diff --git a/abd b/abd
> -new file mode 100644
> -index 0000000..fd3896d
> ---- /dev/null
> -+++ b/abd
> -@@ -0,0 +1 @@
> -+��u���Z��e��E��W�V�/�U?�<|�@6�8'H�1G_�ͧ*��Rҙ�
> ��~�
> -\ No newline at end of file
> -
> -commit 33633e7a1aa31972f125878baf7807be57b1672d
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch modify
> -
> -diff --git a/def b/def
> -index 8baef1b..7d69c2f 100644
> ---- a/def
> -+++ b/def
> -@@ -1 +1,2 @@
> - abc
> -+asjhfksad
> -
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % guilt push
>  Applying patch..remove
>  Patch applied.
> @@ -672,66 +202,6 @@ f f322f08d907e3737a4321b0ec90bc545f71af7cf  .git/patches/master/status
>  r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
>  r 37d588cc39848368810e88332bd03b083f2ce3ac  .git/refs/patches/master/add
>  r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9  .git/refs/patches/master/remove
> -% git log -p
> -commit ffb7faa126a6d91bcdd44a494f76b96dd860b8b9
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch remove
> -
> -diff --git a/abd b/abd
> -deleted file mode 100644
> -index fd3896d..0000000
> ---- a/abd
> -+++ /dev/null
> -@@ -1 +0,0 @@
> --��u���Z��e��E��W�V�/�U?�<|�@6�8'H�1G_�ͧ*��Rҙ�
> ��~�
> -\ No newline at end of file
> -
> -commit 37d588cc39848368810e88332bd03b083f2ce3ac
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch add
> -
> -diff --git a/abd b/abd
> -new file mode 100644
> -index 0000000..fd3896d
> ---- /dev/null
> -+++ b/abd
> -@@ -0,0 +1 @@
> -+��u���Z��e��E��W�V�/�U?�<|�@6�8'H�1G_�ͧ*��Rҙ�
> ��~�
> -\ No newline at end of file
> -
> -commit 33633e7a1aa31972f125878baf7807be57b1672d
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch modify
> -
> -diff --git a/def b/def
> -index 8baef1b..7d69c2f 100644
> ---- a/def
> -+++ b/def
> -@@ -1 +1,2 @@
> - abc
> -+asjhfksad
> -
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % guilt push
>  Applying patch..mode
>  Patch applied.
> @@ -750,76 +220,6 @@ r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
>  r 37d588cc39848368810e88332bd03b083f2ce3ac  .git/refs/patches/master/add
>  r ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba  .git/refs/patches/master/mode
>  r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9  .git/refs/patches/master/remove
> -% git log -p
> -commit ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch mode
> -
> -diff --git a/def b/def
> -old mode 100644
> -new mode 100755
> -
> -commit ffb7faa126a6d91bcdd44a494f76b96dd860b8b9
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch remove
> -
> -diff --git a/abd b/abd
> -deleted file mode 100644
> -index fd3896d..0000000
> ---- a/abd
> -+++ /dev/null
> -@@ -1 +0,0 @@
> --��u���Z��e��E��W�V�/�U?�<|�@6�8'H�1G_�ͧ*��Rҙ�
> ��~�
> -\ No newline at end of file
> -
> -commit 37d588cc39848368810e88332bd03b083f2ce3ac
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch add
> -
> -diff --git a/abd b/abd
> -new file mode 100644
> -index 0000000..fd3896d
> ---- /dev/null
> -+++ b/abd
> -@@ -0,0 +1 @@
> -+��u���Z��e��E��W�V�/�U?�<|�@6�8'H�1G_�ͧ*��Rҙ�
> ��~�
> -\ No newline at end of file
> -
> -commit 33633e7a1aa31972f125878baf7807be57b1672d
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch modify
> -
> -diff --git a/def b/def
> -index 8baef1b..7d69c2f 100644
> ---- a/def
> -+++ b/def
> -@@ -1 +1,2 @@
> - abc
> -+asjhfksad
> -
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % guilt pop --all
>  All patches popped.
>  % guilt push -n -2
> @@ -835,22 +235,6 @@ f 9c18cc7abe6b87f18503714a80a677b4094eb457  .git/patches/master/add
>  f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
>  f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
>  f da39a3ee5e6b4b0d3255bfef95601890afd80709  .git/patches/master/status
> -% git log -p
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % guilt pop --all
>  No patches applied.
>  % guilt push -n -1
> @@ -866,22 +250,6 @@ f 9c18cc7abe6b87f18503714a80a677b4094eb457  .git/patches/master/add
>  f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
>  f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
>  f da39a3ee5e6b4b0d3255bfef95601890afd80709  .git/patches/master/status
> -% git log -p
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % guilt pop --all
>  No patches applied.
>  % guilt push -n 0
> @@ -897,22 +265,6 @@ f 9c18cc7abe6b87f18503714a80a677b4094eb457  .git/patches/master/add
>  f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
>  f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
>  f da39a3ee5e6b4b0d3255bfef95601890afd80709  .git/patches/master/status
> -% git log -p
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % guilt pop --all
>  No patches applied.
>  % guilt push -n 1
> @@ -930,36 +282,6 @@ f 9c18cc7abe6b87f18503714a80a677b4094eb457  .git/patches/master/add
>  f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
>  f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
>  r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
> -% git log -p
> -commit 33633e7a1aa31972f125878baf7807be57b1672d
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch modify
> -
> -diff --git a/def b/def
> -index 8baef1b..7d69c2f 100644
> ---- a/def
> -+++ b/def
> -@@ -1 +1,2 @@
> - abc
> -+asjhfksad
> -
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % guilt pop --all
>  All patches popped.
>  % guilt push -n 2
> @@ -980,51 +302,6 @@ f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
>  f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
>  r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
>  r 37d588cc39848368810e88332bd03b083f2ce3ac  .git/refs/patches/master/add
> -% git log -p
> -commit 37d588cc39848368810e88332bd03b083f2ce3ac
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch add
> -
> -diff --git a/abd b/abd
> -new file mode 100644
> -index 0000000..fd3896d
> ---- /dev/null
> -+++ b/abd
> -@@ -0,0 +1 @@
> -+��u���Z��e��E��W�V�/�U?�<|�@6�8'H�1G_�ͧ*��Rҙ�
> ��~�
> -\ No newline at end of file
> -
> -commit 33633e7a1aa31972f125878baf7807be57b1672d
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch modify
> -
> -diff --git a/def b/def
> -index 8baef1b..7d69c2f 100644
> ---- a/def
> -+++ b/def
> -@@ -1 +1,2 @@
> - abc
> -+asjhfksad
> -
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % guilt pop --all
>  All patches popped.
>  % guilt push -n 3
> @@ -1048,66 +325,6 @@ f f322f08d907e3737a4321b0ec90bc545f71af7cf  .git/patches/master/status
>  r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
>  r 37d588cc39848368810e88332bd03b083f2ce3ac  .git/refs/patches/master/add
>  r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9  .git/refs/patches/master/remove
> -% git log -p
> -commit ffb7faa126a6d91bcdd44a494f76b96dd860b8b9
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch remove
> -
> -diff --git a/abd b/abd
> -deleted file mode 100644
> -index fd3896d..0000000
> ---- a/abd
> -+++ /dev/null
> -@@ -1 +0,0 @@
> --��u���Z��e��E��W�V�/�U?�<|�@6�8'H�1G_�ͧ*��Rҙ�
> ��~�
> -\ No newline at end of file
> -
> -commit 37d588cc39848368810e88332bd03b083f2ce3ac
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch add
> -
> -diff --git a/abd b/abd
> -new file mode 100644
> -index 0000000..fd3896d
> ---- /dev/null
> -+++ b/abd
> -@@ -0,0 +1 @@
> -+��u���Z��e��E��W�V�/�U?�<|�@6�8'H�1G_�ͧ*��Rҙ�
> ��~�
> -\ No newline at end of file
> -
> -commit 33633e7a1aa31972f125878baf7807be57b1672d
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch modify
> -
> -diff --git a/def b/def
> -index 8baef1b..7d69c2f 100644
> ---- a/def
> -+++ b/def
> -@@ -1 +1,2 @@
> - abc
> -+asjhfksad
> -
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % guilt pop --all
>  All patches popped.
>  % guilt push -n 4
> @@ -1134,76 +351,6 @@ r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
>  r 37d588cc39848368810e88332bd03b083f2ce3ac  .git/refs/patches/master/add
>  r ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba  .git/refs/patches/master/mode
>  r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9  .git/refs/patches/master/remove
> -% git log -p
> -commit ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch mode
> -
> -diff --git a/def b/def
> -old mode 100644
> -new mode 100755
> -
> -commit ffb7faa126a6d91bcdd44a494f76b96dd860b8b9
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch remove
> -
> -diff --git a/abd b/abd
> -deleted file mode 100644
> -index fd3896d..0000000
> ---- a/abd
> -+++ /dev/null
> -@@ -1 +0,0 @@
> --��u���Z��e��E��W�V�/�U?�<|�@6�8'H�1G_�ͧ*��Rҙ�
> ��~�
> -\ No newline at end of file
> -
> -commit 37d588cc39848368810e88332bd03b083f2ce3ac
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch add
> -
> -diff --git a/abd b/abd
> -new file mode 100644
> -index 0000000..fd3896d
> ---- /dev/null
> -+++ b/abd
> -@@ -0,0 +1 @@
> -+��u���Z��e��E��W�V�/�U?�<|�@6�8'H�1G_�ͧ*��Rҙ�
> ��~�
> -\ No newline at end of file
> -
> -commit 33633e7a1aa31972f125878baf7807be57b1672d
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch modify
> -
> -diff --git a/def b/def
> -index 8baef1b..7d69c2f 100644
> ---- a/def
> -+++ b/def
> -@@ -1 +1,2 @@
> - abc
> -+asjhfksad
> -
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % guilt pop --all
>  All patches popped.
>  % list_files
> @@ -1236,28 +383,6 @@ f d15a1d2d34493f790c78ddacb8815b0b9536ee2b  .git/patches/master/series
>  f da39a3ee5e6b4b0d3255bfef95601890afd80709  .git/patches/master/empty.patch
>  f e90b964f01cbef60bbe00c38c55d9ea86618a66a  .git/patches/master/status
>  r c7a139f532a43c3c8b0e068cac04f8f6af0f94e1  .git/refs/patches/master/empty.patch
> -% git log -p
> -commit c7a139f532a43c3c8b0e068cac04f8f6af0f94e1
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch empty.patch
> -
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % git config guilt.diffstat true
>  % guilt refresh
>  Patch empty.patch refreshed
> @@ -1280,28 +405,6 @@ f d15a1d2d34493f790c78ddacb8815b0b9536ee2b  .git/patches/master/series
>  f da39a3ee5e6b4b0d3255bfef95601890afd80709  .git/patches/master/empty.patch~
>  f e90b964f01cbef60bbe00c38c55d9ea86618a66a  .git/patches/master/status
>  r c7a139f532a43c3c8b0e068cac04f8f6af0f94e1  .git/refs/patches/master/empty.patch
> -% git log -p
> -commit c7a139f532a43c3c8b0e068cac04f8f6af0f94e1
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch empty.patch
> -
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % git config guilt.diffstat false
>  % guilt pop
>  All patches popped.
> @@ -1322,35 +425,6 @@ f d15a1d2d34493f790c78ddacb8815b0b9536ee2b  .git/patches/master/series
>  f da39a3ee5e6b4b0d3255bfef95601890afd80709  .git/patches/master/empty.patch~
>  f e90b964f01cbef60bbe00c38c55d9ea86618a66a  .git/patches/master/status
>  r 8ed27228b117c0c88abf3d586bcc43c68e975cea  .git/refs/patches/master/empty.patch
> -% git log -p
> -commit 8ed27228b117c0c88abf3d586bcc43c68e975cea
> -Author: Per Cederqvist <ceder@lysator.liu.se>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    Fix a bug.
> -    
> -    This commit fixes a serious bug.
> -    
> -    FIXME:
> -        - add a test case
> -        - track down the bug
> -        - actually fix it
> -
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % git config guilt.diffstat true
>  % guilt refresh
>  Patch empty.patch refreshed
> @@ -1373,35 +447,6 @@ f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
>  f d15a1d2d34493f790c78ddacb8815b0b9536ee2b  .git/patches/master/series
>  f e90b964f01cbef60bbe00c38c55d9ea86618a66a  .git/patches/master/status
>  r 8ed27228b117c0c88abf3d586bcc43c68e975cea  .git/refs/patches/master/empty.patch
> -% git log -p
> -commit 8ed27228b117c0c88abf3d586bcc43c68e975cea
> -Author: Per Cederqvist <ceder@lysator.liu.se>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    Fix a bug.
> -    
> -    This commit fixes a serious bug.
> -    
> -    FIXME:
> -        - add a test case
> -        - track down the bug
> -        - actually fix it
> -
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % git config guilt.diffstat false
>  % guilt refresh
>  Patch empty.patch refreshed
> @@ -1424,35 +469,6 @@ f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
>  f d15a1d2d34493f790c78ddacb8815b0b9536ee2b  .git/patches/master/series
>  f e90b964f01cbef60bbe00c38c55d9ea86618a66a  .git/patches/master/status
>  r 8ed27228b117c0c88abf3d586bcc43c68e975cea  .git/refs/patches/master/empty.patch
> -% git log -p
> -commit 8ed27228b117c0c88abf3d586bcc43c68e975cea
> -Author: Per Cederqvist <ceder@lysator.liu.se>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    Fix a bug.
> -    
> -    This commit fixes a serious bug.
> -    
> -    FIXME:
> -        - add a test case
> -        - track down the bug
> -        - actually fix it
> -
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % guilt delete empty.patch
>  Cannot delete an applied patch
>  % guilt pop -a
> @@ -1470,19 +486,3 @@ f 9c18cc7abe6b87f18503714a80a677b4094eb457  .git/patches/master/add
>  f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
>  f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
>  f da39a3ee5e6b4b0d3255bfef95601890afd80709  .git/patches/master/status
> -% git log -p
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
> diff --git a/regression/t-020.sh b/regression/t-020.sh
> index 3f70c26..2f2aa10 100755
> --- a/regression/t-020.sh
> +++ b/regression/t-020.sh
> @@ -21,8 +21,6 @@ guilt series | while read n ; do
>  	cmd guilt push
>  
>  	cmd list_files
> -
> -	cmd git log -p
>  done
>  
>  #
> @@ -34,8 +32,6 @@ cmd guilt push -a
>  
>  cmd list_files
>  
> -cmd git log -p
> -
>  #
>  # pop all
>  #
> @@ -49,8 +45,6 @@ guilt series | while read n ; do
>  
>  	cmd list_files
>  
> -	cmd git log -p
> -
>  	cmd guilt pop --all
>  done
>  
> @@ -61,8 +55,6 @@ guilt series | while read n ; do
>  	cmd guilt push $t
>  
>  	cmd list_files
> -
> -	cmd git log -p
>  done
>  
>  #
> @@ -80,8 +72,6 @@ for n in `_seq -2 $npatches`; do
>  
>  	cmd list_files
>  
> -	cmd git log -p
> -
>  	cmd guilt pop --all
>  done
>  
> @@ -91,14 +81,12 @@ cmd list_files
>  cmd guilt new empty.patch
>  fixup_time_info empty.patch
>  cmd list_files
> -cmd git log -p
>  
>  # Ensure we can push the empty patch even when guilt.diffstat is true.
>  cmd git config guilt.diffstat true
>  cmd guilt refresh
>  fixup_time_info empty.patch
>  cmd list_files
> -cmd git log -p
>  cmd git config guilt.diffstat false
>  
>  # Let the patch have a commit message, but no data.
> @@ -117,7 +105,6 @@ EOF
>  
>  fixup_time_info empty.patch
>  cmd list_files
> -cmd git log -p
>  
>  # And once more, with an empty diffstat.
>  
> @@ -125,20 +112,17 @@ cmd git config guilt.diffstat true
>  cmd guilt refresh
>  fixup_time_info empty.patch
>  cmd list_files
> -cmd git log -p
>  
>  # Restore the diffstat setting and remove the empty patch.
>  cmd git config guilt.diffstat false
>  cmd guilt refresh
>  fixup_time_info empty.patch
>  cmd list_files
> -cmd git log -p
>  # (Cannot delete an applied patch)
>  shouldfail guilt delete empty.patch
>  cmd guilt pop -a
>  cmd guilt delete -f empty.patch
>  cmd list_files
> -cmd git log -p
>  
>  # FIXME:
>  #   --all
> diff --git a/regression/t-021.out b/regression/t-021.out
> index 58be12f..32dae17 100644
> --- a/regression/t-021.out
> +++ b/regression/t-021.out
> @@ -8,76 +8,21 @@ Applying patch..remove
>  Patch applied.
>  Applying patch..mode
>  Patch applied.
> -% git log -p
> -commit ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch mode
> -
> -diff --git a/def b/def
> -old mode 100644
> -new mode 100755
> -
> -commit ffb7faa126a6d91bcdd44a494f76b96dd860b8b9
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch remove
> -
> -diff --git a/abd b/abd
> -deleted file mode 100644
> -index fd3896d..0000000
> ---- a/abd
> -+++ /dev/null
> -@@ -1 +0,0 @@
> --��u���Z��e��E��W�V�/�U?�<|�@6�8'H�1G_�ͧ*��Rҙ�
> ��~�
> -\ No newline at end of file
> -
> -commit 37d588cc39848368810e88332bd03b083f2ce3ac
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch add
> -
> -diff --git a/abd b/abd
> -new file mode 100644
> -index 0000000..fd3896d
> ---- /dev/null
> -+++ b/abd
> -@@ -0,0 +1 @@
> -+��u���Z��e��E��W�V�/�U?�<|�@6�8'H�1G_�ͧ*��Rҙ�
> ��~�
> -\ No newline at end of file
> -
> -commit 33633e7a1aa31972f125878baf7807be57b1672d
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch modify
> -
> -diff --git a/def b/def
> -index 8baef1b..7d69c2f 100644
> ---- a/def
> -+++ b/def
> -@@ -1 +1,2 @@
> - abc
> -+asjhfksad
> -
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
> +% list_files
> +d .git/patches
> +d .git/patches/master
> +d .git/refs/patches
> +d .git/refs/patches/master
> +f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
> +f 413390f3906f16f30b054a4fb86c1e014b964504  .git/patches/master/remove
> +f 71596bf71b72c2717e1aee378aabefbfa19ab7c8  .git/patches/master/status
> +f 9c18cc7abe6b87f18503714a80a677b4094eb457  .git/patches/master/add
> +f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
> +f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
> +r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
> +r 37d588cc39848368810e88332bd03b083f2ce3ac  .git/refs/patches/master/add
> +r ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba  .git/refs/patches/master/mode
> +r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9  .git/refs/patches/master/remove
>  % guilt pop
>  Now at remove.
>  % list_files
> @@ -94,66 +39,6 @@ f f322f08d907e3737a4321b0ec90bc545f71af7cf  .git/patches/master/status
>  r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
>  r 37d588cc39848368810e88332bd03b083f2ce3ac  .git/refs/patches/master/add
>  r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9  .git/refs/patches/master/remove
> -% git log -p
> -commit ffb7faa126a6d91bcdd44a494f76b96dd860b8b9
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch remove
> -
> -diff --git a/abd b/abd
> -deleted file mode 100644
> -index fd3896d..0000000
> ---- a/abd
> -+++ /dev/null
> -@@ -1 +0,0 @@
> --��u���Z��e��E��W�V�/�U?�<|�@6�8'H�1G_�ͧ*��Rҙ�
> ��~�
> -\ No newline at end of file
> -
> -commit 37d588cc39848368810e88332bd03b083f2ce3ac
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch add
> -
> -diff --git a/abd b/abd
> -new file mode 100644
> -index 0000000..fd3896d
> ---- /dev/null
> -+++ b/abd
> -@@ -0,0 +1 @@
> -+��u���Z��e��E��W�V�/�U?�<|�@6�8'H�1G_�ͧ*��Rҙ�
> ��~�
> -\ No newline at end of file
> -
> -commit 33633e7a1aa31972f125878baf7807be57b1672d
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch modify
> -
> -diff --git a/def b/def
> -index 8baef1b..7d69c2f 100644
> ---- a/def
> -+++ b/def
> -@@ -1 +1,2 @@
> - abc
> -+asjhfksad
> -
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % guilt pop
>  Now at add.
>  % list_files
> @@ -169,51 +54,6 @@ f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
>  f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
>  r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
>  r 37d588cc39848368810e88332bd03b083f2ce3ac  .git/refs/patches/master/add
> -% git log -p
> -commit 37d588cc39848368810e88332bd03b083f2ce3ac
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch add
> -
> -diff --git a/abd b/abd
> -new file mode 100644
> -index 0000000..fd3896d
> ---- /dev/null
> -+++ b/abd
> -@@ -0,0 +1 @@
> -+��u���Z��e��E��W�V�/�U?�<|�@6�8'H�1G_�ͧ*��Rҙ�
> ��~�
> -\ No newline at end of file
> -
> -commit 33633e7a1aa31972f125878baf7807be57b1672d
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch modify
> -
> -diff --git a/def b/def
> -index 8baef1b..7d69c2f 100644
> ---- a/def
> -+++ b/def
> -@@ -1 +1,2 @@
> - abc
> -+asjhfksad
> -
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % guilt pop
>  Now at modify.
>  % list_files
> @@ -228,36 +68,6 @@ f 9c18cc7abe6b87f18503714a80a677b4094eb457  .git/patches/master/add
>  f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
>  f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
>  r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
> -% git log -p
> -commit 33633e7a1aa31972f125878baf7807be57b1672d
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch modify
> -
> -diff --git a/def b/def
> -index 8baef1b..7d69c2f 100644
> ---- a/def
> -+++ b/def
> -@@ -1 +1,2 @@
> - abc
> -+asjhfksad
> -
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % guilt pop
>  All patches popped.
>  % list_files
> @@ -271,22 +81,6 @@ f 9c18cc7abe6b87f18503714a80a677b4094eb457  .git/patches/master/add
>  f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
>  f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
>  f da39a3ee5e6b4b0d3255bfef95601890afd80709  .git/patches/master/status
> -% git log -p
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % guilt pop
>  No patches applied.
>  % guilt push --all
> @@ -314,66 +108,6 @@ f f322f08d907e3737a4321b0ec90bc545f71af7cf  .git/patches/master/status
>  r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
>  r 37d588cc39848368810e88332bd03b083f2ce3ac  .git/refs/patches/master/add
>  r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9  .git/refs/patches/master/remove
> -% git log -p
> -commit ffb7faa126a6d91bcdd44a494f76b96dd860b8b9
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch remove
> -
> -diff --git a/abd b/abd
> -deleted file mode 100644
> -index fd3896d..0000000
> ---- a/abd
> -+++ /dev/null
> -@@ -1 +0,0 @@
> --��u���Z��e��E��W�V�/�U?�<|�@6�8'H�1G_�ͧ*��Rҙ�
> ��~�
> -\ No newline at end of file
> -
> -commit 37d588cc39848368810e88332bd03b083f2ce3ac
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch add
> -
> -diff --git a/abd b/abd
> -new file mode 100644
> -index 0000000..fd3896d
> ---- /dev/null
> -+++ b/abd
> -@@ -0,0 +1 @@
> -+��u���Z��e��E��W�V�/�U?�<|�@6�8'H�1G_�ͧ*��Rҙ�
> ��~�
> -\ No newline at end of file
> -
> -commit 33633e7a1aa31972f125878baf7807be57b1672d
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch modify
> -
> -diff --git a/def b/def
> -index 8baef1b..7d69c2f 100644
> ---- a/def
> -+++ b/def
> -@@ -1 +1,2 @@
> - abc
> -+asjhfksad
> -
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % guilt push --all
>  Applying patch..mode
>  Patch applied.
> @@ -392,51 +126,6 @@ f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
>  f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
>  r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
>  r 37d588cc39848368810e88332bd03b083f2ce3ac  .git/refs/patches/master/add
> -% git log -p
> -commit 37d588cc39848368810e88332bd03b083f2ce3ac
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch add
> -
> -diff --git a/abd b/abd
> -new file mode 100644
> -index 0000000..fd3896d
> ---- /dev/null
> -+++ b/abd
> -@@ -0,0 +1 @@
> -+��u���Z��e��E��W�V�/�U?�<|�@6�8'H�1G_�ͧ*��Rҙ�
> ��~�
> -\ No newline at end of file
> -
> -commit 33633e7a1aa31972f125878baf7807be57b1672d
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch modify
> -
> -diff --git a/def b/def
> -index 8baef1b..7d69c2f 100644
> ---- a/def
> -+++ b/def
> -@@ -1 +1,2 @@
> - abc
> -+asjhfksad
> -
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % guilt push --all
>  Applying patch..remove
>  Patch applied.
> @@ -456,36 +145,6 @@ f 9c18cc7abe6b87f18503714a80a677b4094eb457  .git/patches/master/add
>  f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
>  f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
>  r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
> -% git log -p
> -commit 33633e7a1aa31972f125878baf7807be57b1672d
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch modify
> -
> -diff --git a/def b/def
> -index 8baef1b..7d69c2f 100644
> ---- a/def
> -+++ b/def
> -@@ -1 +1,2 @@
> - abc
> -+asjhfksad
> -
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % guilt push --all
>  Applying patch..add
>  Patch applied.
> @@ -506,22 +165,6 @@ f 9c18cc7abe6b87f18503714a80a677b4094eb457  .git/patches/master/add
>  f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
>  f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
>  f da39a3ee5e6b4b0d3255bfef95601890afd80709  .git/patches/master/status
> -% git log -p
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % guilt push --all
>  Applying patch..modify
>  Patch applied.
> @@ -547,66 +190,6 @@ f f322f08d907e3737a4321b0ec90bc545f71af7cf  .git/patches/master/status
>  r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
>  r 37d588cc39848368810e88332bd03b083f2ce3ac  .git/refs/patches/master/add
>  r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9  .git/refs/patches/master/remove
> -% git log -p
> -commit ffb7faa126a6d91bcdd44a494f76b96dd860b8b9
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch remove
> -
> -diff --git a/abd b/abd
> -deleted file mode 100644
> -index fd3896d..0000000
> ---- a/abd
> -+++ /dev/null
> -@@ -1 +0,0 @@
> --��u���Z��e��E��W�V�/�U?�<|�@6�8'H�1G_�ͧ*��Rҙ�
> ��~�
> -\ No newline at end of file
> -
> -commit 37d588cc39848368810e88332bd03b083f2ce3ac
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch add
> -
> -diff --git a/abd b/abd
> -new file mode 100644
> -index 0000000..fd3896d
> ---- /dev/null
> -+++ b/abd
> -@@ -0,0 +1 @@
> -+��u���Z��e��E��W�V�/�U?�<|�@6�8'H�1G_�ͧ*��Rҙ�
> ��~�
> -\ No newline at end of file
> -
> -commit 33633e7a1aa31972f125878baf7807be57b1672d
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch modify
> -
> -diff --git a/def b/def
> -index 8baef1b..7d69c2f 100644
> ---- a/def
> -+++ b/def
> -@@ -1 +1,2 @@
> - abc
> -+asjhfksad
> -
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % guilt pop
>  Now at add.
>  % list_files
> @@ -622,51 +205,6 @@ f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
>  f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
>  r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
>  r 37d588cc39848368810e88332bd03b083f2ce3ac  .git/refs/patches/master/add
> -% git log -p
> -commit 37d588cc39848368810e88332bd03b083f2ce3ac
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch add
> -
> -diff --git a/abd b/abd
> -new file mode 100644
> -index 0000000..fd3896d
> ---- /dev/null
> -+++ b/abd
> -@@ -0,0 +1 @@
> -+��u���Z��e��E��W�V�/�U?�<|�@6�8'H�1G_�ͧ*��Rҙ�
> ��~�
> -\ No newline at end of file
> -
> -commit 33633e7a1aa31972f125878baf7807be57b1672d
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch modify
> -
> -diff --git a/def b/def
> -index 8baef1b..7d69c2f 100644
> ---- a/def
> -+++ b/def
> -@@ -1 +1,2 @@
> - abc
> -+asjhfksad
> -
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % guilt pop
>  Now at modify.
>  % list_files
> @@ -681,36 +219,6 @@ f 9c18cc7abe6b87f18503714a80a677b4094eb457  .git/patches/master/add
>  f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
>  f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
>  r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
> -% git log -p
> -commit 33633e7a1aa31972f125878baf7807be57b1672d
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch modify
> -
> -diff --git a/def b/def
> -index 8baef1b..7d69c2f 100644
> ---- a/def
> -+++ b/def
> -@@ -1 +1,2 @@
> - abc
> -+asjhfksad
> -
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % guilt pop
>  All patches popped.
>  % list_files
> @@ -724,22 +232,6 @@ f 9c18cc7abe6b87f18503714a80a677b4094eb457  .git/patches/master/add
>  f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
>  f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
>  f da39a3ee5e6b4b0d3255bfef95601890afd80709  .git/patches/master/status
> -% git log -p
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % guilt push --all
>  Applying patch..modify
>  Patch applied.
> @@ -766,76 +258,6 @@ r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
>  r 37d588cc39848368810e88332bd03b083f2ce3ac  .git/refs/patches/master/add
>  r ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba  .git/refs/patches/master/mode
>  r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9  .git/refs/patches/master/remove
> -% git log -p
> -commit ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch mode
> -
> -diff --git a/def b/def
> -old mode 100644
> -new mode 100755
> -
> -commit ffb7faa126a6d91bcdd44a494f76b96dd860b8b9
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch remove
> -
> -diff --git a/abd b/abd
> -deleted file mode 100644
> -index fd3896d..0000000
> ---- a/abd
> -+++ /dev/null
> -@@ -1 +0,0 @@
> --��u���Z��e��E��W�V�/�U?�<|�@6�8'H�1G_�ͧ*��Rҙ�
> ��~�
> -\ No newline at end of file
> -
> -commit 37d588cc39848368810e88332bd03b083f2ce3ac
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch add
> -
> -diff --git a/abd b/abd
> -new file mode 100644
> -index 0000000..fd3896d
> ---- /dev/null
> -+++ b/abd
> -@@ -0,0 +1 @@
> -+��u���Z��e��E��W�V�/�U?�<|�@6�8'H�1G_�ͧ*��Rҙ�
> ��~�
> -\ No newline at end of file
> -
> -commit 33633e7a1aa31972f125878baf7807be57b1672d
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch modify
> -
> -diff --git a/def b/def
> -index 8baef1b..7d69c2f 100644
> ---- a/def
> -+++ b/def
> -@@ -1 +1,2 @@
> - abc
> -+asjhfksad
> -
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % guilt push --all
>  File series fully applied, ends at patch mode
>  % guilt pop -n -1
> @@ -855,76 +277,6 @@ r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
>  r 37d588cc39848368810e88332bd03b083f2ce3ac  .git/refs/patches/master/add
>  r ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba  .git/refs/patches/master/mode
>  r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9  .git/refs/patches/master/remove
> -% git log -p
> -commit ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch mode
> -
> -diff --git a/def b/def
> -old mode 100644
> -new mode 100755
> -
> -commit ffb7faa126a6d91bcdd44a494f76b96dd860b8b9
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch remove
> -
> -diff --git a/abd b/abd
> -deleted file mode 100644
> -index fd3896d..0000000
> ---- a/abd
> -+++ /dev/null
> -@@ -1 +0,0 @@
> --��u���Z��e��E��W�V�/�U?�<|�@6�8'H�1G_�ͧ*��Rҙ�
> ��~�
> -\ No newline at end of file
> -
> -commit 37d588cc39848368810e88332bd03b083f2ce3ac
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch add
> -
> -diff --git a/abd b/abd
> -new file mode 100644
> -index 0000000..fd3896d
> ---- /dev/null
> -+++ b/abd
> -@@ -0,0 +1 @@
> -+��u���Z��e��E��W�V�/�U?�<|�@6�8'H�1G_�ͧ*��Rҙ�
> ��~�
> -\ No newline at end of file
> -
> -commit 33633e7a1aa31972f125878baf7807be57b1672d
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch modify
> -
> -diff --git a/def b/def
> -index 8baef1b..7d69c2f 100644
> ---- a/def
> -+++ b/def
> -@@ -1 +1,2 @@
> - abc
> -+asjhfksad
> -
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % guilt push --all
>  File series fully applied, ends at patch mode
>  % guilt pop -n 0
> @@ -944,76 +296,6 @@ r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
>  r 37d588cc39848368810e88332bd03b083f2ce3ac  .git/refs/patches/master/add
>  r ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba  .git/refs/patches/master/mode
>  r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9  .git/refs/patches/master/remove
> -% git log -p
> -commit ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch mode
> -
> -diff --git a/def b/def
> -old mode 100644
> -new mode 100755
> -
> -commit ffb7faa126a6d91bcdd44a494f76b96dd860b8b9
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch remove
> -
> -diff --git a/abd b/abd
> -deleted file mode 100644
> -index fd3896d..0000000
> ---- a/abd
> -+++ /dev/null
> -@@ -1 +0,0 @@
> --��u���Z��e��E��W�V�/�U?�<|�@6�8'H�1G_�ͧ*��Rҙ�
> ��~�
> -\ No newline at end of file
> -
> -commit 37d588cc39848368810e88332bd03b083f2ce3ac
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch add
> -
> -diff --git a/abd b/abd
> -new file mode 100644
> -index 0000000..fd3896d
> ---- /dev/null
> -+++ b/abd
> -@@ -0,0 +1 @@
> -+��u���Z��e��E��W�V�/�U?�<|�@6�8'H�1G_�ͧ*��Rҙ�
> ��~�
> -\ No newline at end of file
> -
> -commit 33633e7a1aa31972f125878baf7807be57b1672d
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch modify
> -
> -diff --git a/def b/def
> -index 8baef1b..7d69c2f 100644
> ---- a/def
> -+++ b/def
> -@@ -1 +1,2 @@
> - abc
> -+asjhfksad
> -
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % guilt push --all
>  File series fully applied, ends at patch mode
>  % guilt pop -n 1
> @@ -1032,66 +314,6 @@ f f322f08d907e3737a4321b0ec90bc545f71af7cf  .git/patches/master/status
>  r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
>  r 37d588cc39848368810e88332bd03b083f2ce3ac  .git/refs/patches/master/add
>  r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9  .git/refs/patches/master/remove
> -% git log -p
> -commit ffb7faa126a6d91bcdd44a494f76b96dd860b8b9
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch remove
> -
> -diff --git a/abd b/abd
> -deleted file mode 100644
> -index fd3896d..0000000
> ---- a/abd
> -+++ /dev/null
> -@@ -1 +0,0 @@
> --��u���Z��e��E��W�V�/�U?�<|�@6�8'H�1G_�ͧ*��Rҙ�
> ��~�
> -\ No newline at end of file
> -
> -commit 37d588cc39848368810e88332bd03b083f2ce3ac
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch add
> -
> -diff --git a/abd b/abd
> -new file mode 100644
> -index 0000000..fd3896d
> ---- /dev/null
> -+++ b/abd
> -@@ -0,0 +1 @@
> -+��u���Z��e��E��W�V�/�U?�<|�@6�8'H�1G_�ͧ*��Rҙ�
> ��~�
> -\ No newline at end of file
> -
> -commit 33633e7a1aa31972f125878baf7807be57b1672d
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch modify
> -
> -diff --git a/def b/def
> -index 8baef1b..7d69c2f 100644
> ---- a/def
> -+++ b/def
> -@@ -1 +1,2 @@
> - abc
> -+asjhfksad
> -
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % guilt push --all
>  Applying patch..mode
>  Patch applied.
> @@ -1110,51 +332,6 @@ f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
>  f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
>  r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
>  r 37d588cc39848368810e88332bd03b083f2ce3ac  .git/refs/patches/master/add
> -% git log -p
> -commit 37d588cc39848368810e88332bd03b083f2ce3ac
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch add
> -
> -diff --git a/abd b/abd
> -new file mode 100644
> -index 0000000..fd3896d
> ---- /dev/null
> -+++ b/abd
> -@@ -0,0 +1 @@
> -+��u���Z��e��E��W�V�/�U?�<|�@6�8'H�1G_�ͧ*��Rҙ�
> ��~�
> -\ No newline at end of file
> -
> -commit 33633e7a1aa31972f125878baf7807be57b1672d
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch modify
> -
> -diff --git a/def b/def
> -index 8baef1b..7d69c2f 100644
> ---- a/def
> -+++ b/def
> -@@ -1 +1,2 @@
> - abc
> -+asjhfksad
> -
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % guilt push --all
>  Applying patch..remove
>  Patch applied.
> @@ -1174,36 +351,6 @@ f 9c18cc7abe6b87f18503714a80a677b4094eb457  .git/patches/master/add
>  f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
>  f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
>  r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
> -% git log -p
> -commit 33633e7a1aa31972f125878baf7807be57b1672d
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    patch modify
> -
> -diff --git a/def b/def
> -index 8baef1b..7d69c2f 100644
> ---- a/def
> -+++ b/def
> -@@ -1 +1,2 @@
> - abc
> -+asjhfksad
> -
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % guilt push --all
>  Applying patch..add
>  Patch applied.
> @@ -1224,22 +371,6 @@ f 9c18cc7abe6b87f18503714a80a677b4094eb457  .git/patches/master/add
>  f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
>  f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
>  f da39a3ee5e6b4b0d3255bfef95601890afd80709  .git/patches/master/status
> -% git log -p
> -commit d4850419ccc1146c7169f500725ce504b9774ed0
> -Author: Author Name <author@email>
> -Date:   Mon Jan 1 00:00:00 2007 +0000
> -
> -    initial
> -    
> -    Signed-off-by: Commiter Name <commiter@email>
> -
> -diff --git a/def b/def
> -new file mode 100644
> -index 0000000..8baef1b
> ---- /dev/null
> -+++ b/def
> -@@ -0,0 +1 @@
> -+abc
>  % guilt push --all
>  Applying patch..modify
>  Patch applied.
> diff --git a/regression/t-021.sh b/regression/t-021.sh
> index e0d2dc1..2873234 100755
> --- a/regression/t-021.sh
> +++ b/regression/t-021.sh
> @@ -9,7 +9,7 @@ cmd setup_repo
>  
>  cmd guilt push --all
>  
> -cmd git log -p
> +cmd list_files
>  
>  #
>  # incremental pop by 1
> @@ -18,8 +18,6 @@ guilt series | _tac | while read n ; do
>  	cmd guilt pop
>  
>  	cmd list_files
> -
> -	cmd git log -p
>  done
>  
>  #
> @@ -41,8 +39,6 @@ guilt series | _tac | while read n ; do
>  
>  	cmd list_files
>  
> -	cmd git log -p
> -
>  	cmd guilt push --all
>  done
>  
> @@ -53,8 +49,6 @@ guilt series | _tac | while read n ; do
>  	cmd guilt pop $t
>  
>  	cmd list_files
> -
> -	cmd git log -p
>  done
>  
>  #
> @@ -72,8 +66,6 @@ for n in `_seq -2 $npatches`; do
>  
>  	cmd list_files
>  
> -	cmd git log -p
> -
>  	cmd guilt push --all
>  done
>  
> -- 
> 1.8.3.1
> 
-- 
I already backed up the [server] once, I can do it again.
		- a sysadmin threatening to do more frequent backups
Previous: Per Cederqvist
Message 41 of 41 in “[GUILT v3 00/31] Teach guilt import-commit how to create legal patch names, and more”
  1. Per CederqvistMay 16, 2014
  2. 01/31 The tests should not fail if guilt.diffstat is set.Per Cederqvist, May 16, 2014
  3. 02/31 Allow "guilt delete -f" to run from a dir which contains spaces.Per Cederqvist, May 16, 2014
  4. 03/31 Added test case for "guilt delete -f".Per Cederqvist, May 16, 2014
  5. 04/31 Allow "guilt import-commit" to run from a dir which contains spaces.Per Cederqvist, May 16, 2014
  6. 05/31 "guilt new": Accept more than 4 arguments.Per Cederqvist, May 16, 2014
  7. 06/31 Fix the do_get_patch function.Per Cederqvist, May 16, 2014
  8. 07/31 Added test cases for "guilt fold".Per Cederqvist, May 16, 2014
  9. 08/31 Added more test cases for "guilt new": empty patches.Per Cederqvist, May 16, 2014
  10. Jeff SipekMay 16, 2014
  11. 09/31 Test suite: properly check the exit status of commands.Per Cederqvist, May 16, 2014
  12. Jeff SipekMay 16, 2014
  13. Per CederqvistMay 18, 2014
  14. 10/31 Run test_failed if the exit status of a test script is bad.Per Cederqvist, May 16, 2014
  15. 11/31 test suite: remove pointless redirection.Per Cederqvist, May 16, 2014
  16. 12/31 "guilt header": more robust header selection.Per Cederqvist, May 16, 2014
  17. Jeff SipekMay 16, 2014
  18. 13/31 Check that "guilt header '.*'" fails.Per Cederqvist, May 16, 2014
  19. 14/31 Use "git check-ref-format" to validate patch names.Per Cederqvist, May 16, 2014
  20. Jeff SipekMay 16, 2014
  21. Per CederqvistMay 18, 2014
  22. 15/31 Produce legal patch names in guilt-import-commit.Per Cederqvist, May 16, 2014
  23. 16/31 Fix backslash handling when creating names of imported patches.Per Cederqvist, May 16, 2014
  24. 17/31 "guilt graph" no longer loops when no patches are applied.Per Cederqvist, May 16, 2014
  25. 18/31 guilt-graph: Handle commas in branch names.Per Cederqvist, May 16, 2014
  26. 19/31 Check that "guilt graph" works when working on a branch with a comma.Per Cederqvist, May 16, 2014
  27. 20/31 "guilt graph": Handle patch names containing quotes.Per Cederqvist, May 16, 2014
  28. 21/31 The log.decorate setting should not influence import-commit.Per Cederqvist, May 16, 2014
  29. 22/31 The log.decorate setting should not influence patchbomb.Per Cederqvist, May 16, 2014
  30. 23/31 The log.decorate setting should not influence guilt rebase.Per Cederqvist, May 16, 2014
  31. 24/31 disp no longer processes backslashes.Per Cederqvist, May 16, 2014
  32. 25/31 "guilt push" now fails when there are no more patches to push.Per Cederqvist, May 16, 2014
  33. 26/31 "guilt pop" now fails when there are no more patches to pop.Per Cederqvist, May 16, 2014
  34. 27/31 Minor testsuite fix.Per Cederqvist, May 16, 2014
  35. 28/31 Fix coding style errors in t-061.sh.Per Cederqvist, May 16, 2014
  36. Jeff SipekMay 16, 2014
  37. 29/31 Added guilt.reusebranch configuration option.Per Cederqvist, May 16, 2014
  38. Jeff SipekMay 16, 2014
  39. 30/31 Added a short style guide, and Emacs settings.Per Cederqvist, May 16, 2014
  40. 31/31 Don't use "git log -p" in the test suite.Per Cederqvist, May 16, 2014
  41. Jeff SipekMay 16, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.