From: Per Cederqvist <cederp@opera.com>
To: Jeff Sipek <jeffpc@josefsipek.net>
Cc: git@vger.kernel.org, Per Cederqvist <cederp@opera.com>
Subject: [GUILT v4 31/33] Don't use "git log -p" in the test suite.
Date: Mon, 19 May 2014 00:00:07 +0200 [thread overview]
Message-ID: <1400450409-30998-32-git-send-email-cederp@opera.com> (raw)
In-Reply-To: <1400450409-30998-1-git-send-email-cederp@opera.com>
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>
Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
---
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^[Ø\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤
\x7fªÂ~·
-\ 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^[Ø\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤
\x7fªÂ~·
-\ 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^[Ø\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤
\x7fªÂ~·
-\ 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^[Ø\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤
\x7fªÂ~·
-\ 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^[Ø\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤
\x7fªÂ~·
-\ 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^[Ø\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤
\x7fªÂ~·
-\ 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^[Ø\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤
\x7fªÂ~·
-\ 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^[Ø\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤
\x7fªÂ~·
-\ 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^[Ø\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤
\x7fªÂ~·
-\ 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^[Ø\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤
\x7fªÂ~·
-\ 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^[Ø\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤
\x7fªÂ~·
-\ 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^[Ø\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤
\x7fªÂ~·
-\ 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^[Ø\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤
\x7fªÂ~·
-\ 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^[Ø\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤
\x7fªÂ~·
-\ 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^[Ø\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤
\x7fªÂ~·
-\ 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^[Ø\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤
\x7fªÂ~·
-\ 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^[Ø\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤
\x7fªÂ~·
-\ 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^[Ø\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤
\x7fªÂ~·
-\ 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^[Ø\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤
\x7fªÂ~·
-\ 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^[Ø\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤
\x7fªÂ~·
-\ 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^[Ø\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤
\x7fªÂ~·
-\ 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^[Ø\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤
\x7fªÂ~·
-\ 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^[Ø\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤
\x7fªÂ~·
-\ 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^[Ø\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤
\x7fªÂ~·
-\ 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^[Ø\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤
\x7fªÂ~·
-\ 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^[Ø\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤
\x7fªÂ~·
-\ 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^[Ø\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤
\x7fªÂ~·
-\ 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^[Ø\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤
\x7fªÂ~·
-\ 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^[Ø\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤
\x7fªÂ~·
-\ 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^[Ø\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤
\x7fªÂ~·
-\ 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^[Ø\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤
\x7fªÂ~·
-\ 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^[Ø\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤
\x7fªÂ~·
-\ 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^[Ø\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤
\x7fªÂ~·
-\ 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^[Ø\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤
\x7fªÂ~·
-\ 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^[Ø\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤
\x7fªÂ~·
-\ 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^[Ø\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤
\x7fªÂ~·
-\ 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^[Ø\x14½\x04á\x1a\x7fZâñeÏÈE„£\x06\x1fWÀV¼/›\x03U?Ú<|\x13\x12¢@6¤8'H¸1G_˜Í§*·\x12ðRÒ™¤
\x7fªÂ~·
-\ 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
next prev parent reply other threads:[~2014-05-18 22:14 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-18 21:59 [GUILT v4 00/33] Teach guilt import-commit how to create legal patch names, and more Per Cederqvist
2014-05-18 21:59 ` [GUILT v4 01/33] The tests should not fail if guilt.diffstat is set Per Cederqvist
2014-05-18 21:59 ` [GUILT v4 02/33] Allow "guilt delete -f" to run from a dir which contains spaces Per Cederqvist
2014-05-18 21:59 ` [GUILT v4 03/33] Added test case for "guilt delete -f" Per Cederqvist
2014-05-18 21:59 ` [GUILT v4 04/33] Allow "guilt import-commit" to run from a dir which contains spaces Per Cederqvist
2014-05-18 21:59 ` [GUILT v4 05/33] "guilt new": Accept more than 4 arguments Per Cederqvist
2014-05-18 21:59 ` [GUILT v4 06/33] Fix the do_get_patch function Per Cederqvist
2014-05-18 21:59 ` [GUILT v4 07/33] Added test cases for "guilt fold" Per Cederqvist
2014-05-18 21:59 ` [GUILT v4 08/33] Added more test cases for "guilt new": empty patches Per Cederqvist
2014-05-18 21:59 ` [GUILT v4 09/33] Test suite: properly check the exit status of commands Per Cederqvist
2015-01-22 14:27 ` Jeff Sipek
2014-05-18 21:59 ` [GUILT v4 10/33] Run test_failed if the exit status of a test script is bad Per Cederqvist
2014-05-18 21:59 ` [GUILT v4 11/33] test suite: remove pointless redirection Per Cederqvist
2014-05-18 21:59 ` [GUILT v4 12/33] "guilt header": more robust header selection Per Cederqvist
2014-05-18 21:59 ` [GUILT v4 13/33] Check that "guilt header '.*'" fails Per Cederqvist
2014-05-18 21:59 ` [GUILT v4 14/33] Use "git check-ref-format" to validate patch names Per Cederqvist
2015-01-22 14:18 ` Jeff Sipek
2014-05-18 21:59 ` [GUILT v4 15/33] Produce legal patch names in guilt-import-commit Per Cederqvist
2015-01-22 14:15 ` Jeff Sipek
2015-01-22 15:50 ` Per Cederqvist
2014-05-18 21:59 ` [GUILT v4 16/33] Fix backslash handling when creating names of imported patches Per Cederqvist
2014-05-18 21:59 ` [GUILT v4 17/33] "guilt graph" no longer loops when no patches are applied Per Cederqvist
2014-05-18 21:59 ` [GUILT v4 18/33] guilt-graph: Handle commas in branch names Per Cederqvist
2014-05-18 21:59 ` [GUILT v4 19/33] Check that "guilt graph" works when working on a branch with a comma Per Cederqvist
2014-05-18 21:59 ` [GUILT v4 20/33] "guilt graph": Handle patch names containing quotes Per Cederqvist
2014-05-18 21:59 ` [GUILT v4 21/33] The log.decorate setting should not influence import-commit Per Cederqvist
2014-05-18 21:59 ` [GUILT v4 22/33] The log.decorate setting should not influence patchbomb Per Cederqvist
2014-05-18 21:59 ` [GUILT v4 23/33] The log.decorate setting should not influence guilt rebase Per Cederqvist
2014-05-18 22:00 ` [GUILT v4 24/33] disp no longer processes backslashes Per Cederqvist
2014-05-18 22:00 ` [GUILT v4 25/33] "guilt push" now fails when there are no more patches to push Per Cederqvist
2014-05-18 22:00 ` [GUILT v4 26/33] "guilt pop" now fails when there are no more patches to pop Per Cederqvist
2014-05-18 22:00 ` [GUILT v4 27/33] Minor testsuite fix Per Cederqvist
2014-05-18 22:00 ` [GUILT v4 28/33] Fix coding style errors in t-061.sh Per Cederqvist
2014-05-18 22:00 ` [GUILT v4 29/33] Added guilt.reusebranch configuration option Per Cederqvist
2014-05-18 22:00 ` [GUILT v4 30/33] Added a short style guide, and Emacs settings Per Cederqvist
2014-05-18 22:00 ` Per Cederqvist [this message]
2014-05-18 22:00 ` [GUILT v4 32/33] Improved doc and tests for guilt header Per Cederqvist
2015-01-22 13:56 ` Jeff Sipek
2014-05-18 22:00 ` [GUILT v4 33/33] Document the exit status of guilt push and guilt pop Per Cederqvist
2015-01-22 14:31 ` Jeff Sipek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1400450409-30998-32-git-send-email-cederp@opera.com \
--to=cederp@opera.com \
--cc=git@vger.kernel.org \
--cc=jeffpc@josefsipek.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).