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 07/33] Added test cases for "guilt fold".
Date: Sun, 18 May 2014 23:59:43 +0200 [thread overview]
Message-ID: <1400450409-30998-8-git-send-email-cederp@opera.com> (raw)
In-Reply-To: <1400450409-30998-1-git-send-email-cederp@opera.com>
Test that we can combine any combination of patches with empty and
non-empty messages, both with and without guilt.diffstat. (All
patches are empty.)
Signed-off-by: Per Cederqvist <cederp@opera.com>
Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
---
regression/t-035.out | 467 +++++++++++++++++++++++++++++++++++++++++++++++++++
regression/t-035.sh | 61 +++++++
2 files changed, 528 insertions(+)
create mode 100644 regression/t-035.out
create mode 100755 regression/t-035.sh
diff --git a/regression/t-035.out b/regression/t-035.out
new file mode 100644
index 0000000..cc16fb4
--- /dev/null
+++ b/regression/t-035.out
@@ -0,0 +1,467 @@
+% setup_repo
+% git config guilt.diffstat true
+%% empty + empty (diffstat=true)
+% guilt new empty-1
+% guilt pop
+All patches popped.
+% guilt push
+Applying patch..empty-1
+Patch applied.
+% guilt new empty-2
+% guilt pop
+Now at empty-1.
+% guilt push
+Applying patch..empty-2
+Patch applied.
+% guilt pop
+Now at empty-1.
+% guilt fold empty-2
+% guilt pop
+All patches popped.
+% guilt push
+Applying patch..empty-1
+Patch applied.
+% 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 4ea806e306f0228a8ef41f186035e7b04097f1f2 .git/patches/master/status
+f 7d261b8caad0f161c21daf5de65eeb521ff8c067 .git/patches/master/empty-1
+f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
+f d28d87b88c1e24d637e390dc3603cfa7c1715711 .git/patches/master/series
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-1~
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-2~
+r bde3d337af70f36836ad606c800d194006f883b3 .git/refs/patches/master/empty-1
+% guilt pop
+All patches popped.
+% guilt delete -f empty-1
+% 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 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-1~
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-2~
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status
+%% empty + nonempty (diffstat=true)
+% guilt new empty
+% guilt pop
+All patches popped.
+% guilt push
+Applying patch..empty
+Patch applied.
+% guilt new -f -s -m A commit message. nonempty
+% guilt pop
+Now at empty.
+% guilt push
+Applying patch..nonempty
+Patch applied.
+% guilt pop
+Now at empty.
+% guilt fold nonempty
+% guilt pop
+All patches popped.
+% guilt push
+Applying patch..empty
+Patch applied.
+% list_files
+d .git/patches
+d .git/patches/master
+d .git/refs/patches
+d .git/refs/patches/master
+f 15aab0fd8b937eb3bb01841693f35dcb75da2faf .git/patches/master/status
+f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
+f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
+f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/empty~
+f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/nonempty~
+f 683678040eef9334d6329e00d5b9babda3e65b57 .git/patches/master/empty
+f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
+f a26a22287b500a2a372e42c2bab03599bbe37cdf .git/patches/master/series
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-1~
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-2~
+r 4eedaa32894fc07af3298d8c1178052942a3ca6a .git/refs/patches/master/empty
+% guilt pop
+All patches popped.
+% guilt delete -f empty
+% 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 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/empty~
+f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/nonempty~
+f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-1~
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-2~
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status
+%% nonempty + empty (diffstat=true)
+% guilt new -f -s -m A commit message. nonempty
+% guilt pop
+All patches popped.
+% guilt push
+Applying patch..nonempty
+Patch applied.
+% guilt new empty
+% guilt pop
+Now at nonempty.
+% guilt push
+Applying patch..empty
+Patch applied.
+% guilt pop
+Now at nonempty.
+% guilt fold empty
+% guilt pop
+All patches popped.
+% guilt push
+Applying patch..nonempty
+Patch applied.
+% 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 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/nonempty~
+f 683678040eef9334d6329e00d5b9babda3e65b57 .git/patches/master/nonempty
+f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
+f c47ddc01337e3bb67a9968a8823a5ba12be67f77 .git/patches/master/series
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-1~
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-2~
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty~
+f f7f068d44bf796d0f7cd14d27d1f48d6e659816a .git/patches/master/status
+r 4eedaa32894fc07af3298d8c1178052942a3ca6a .git/refs/patches/master/nonempty
+% guilt pop
+All patches popped.
+% guilt delete -f nonempty
+% 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 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/nonempty~
+f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-1~
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-2~
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty~
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status
+%% nonempty + nonempty (diffstat=true)
+% guilt new -f -s -m A commit message. nonempty-1
+% guilt pop
+All patches popped.
+% guilt push
+Applying patch..nonempty-1
+Patch applied.
+% guilt new -f -s -m Another commit message. nonempty-2
+% guilt pop
+Now at nonempty-1.
+% guilt push
+Applying patch..nonempty-2
+Patch applied.
+% guilt pop
+Now at nonempty-1.
+% guilt fold nonempty-2
+% guilt pop
+All patches popped.
+% guilt push
+Applying patch..nonempty-1
+Patch applied.
+% 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 3b526c794741fb2d6b463f3245ab2f260fa74b7b .git/patches/master/status
+f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
+f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/nonempty~
+f 669c9685ce791098bb3573f80af6d720a3689f80 .git/patches/master/nonempty-1
+f 75c672c7dbec8e8275d26d720f499899d04912a4 .git/patches/master/nonempty-1~
+f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
+f a88f2625f128cfa307a52c8c2e84ed6c32a78d2b .git/patches/master/series
+f bbdc17918ad7ba268ea90ebf0fb71e32e0f09a02 .git/patches/master/nonempty-2~
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-1~
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-2~
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty~
+r 895dfbc21bde85fcc666a353a6bd32eaec939082 .git/refs/patches/master/nonempty-1
+% guilt pop
+All patches popped.
+% guilt delete -f nonempty-1
+% 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 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/nonempty~
+f 75c672c7dbec8e8275d26d720f499899d04912a4 .git/patches/master/nonempty-1~
+f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series
+f bbdc17918ad7ba268ea90ebf0fb71e32e0f09a02 .git/patches/master/nonempty-2~
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-1~
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-2~
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty~
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status
+% git config guilt.diffstat false
+%% empty + empty (diffstat=false)
+% guilt new empty-1
+% guilt pop
+All patches popped.
+% guilt push
+Applying patch..empty-1
+Patch applied.
+% guilt new empty-2
+% guilt pop
+Now at empty-1.
+% guilt push
+Applying patch..empty-2
+Patch applied.
+% guilt pop
+Now at empty-1.
+% guilt fold empty-2
+% guilt pop
+All patches popped.
+% guilt push
+Applying patch..empty-1
+Patch applied.
+% 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 4ea806e306f0228a8ef41f186035e7b04097f1f2 .git/patches/master/status
+f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/nonempty~
+f 75c672c7dbec8e8275d26d720f499899d04912a4 .git/patches/master/nonempty-1~
+f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
+f bbdc17918ad7ba268ea90ebf0fb71e32e0f09a02 .git/patches/master/nonempty-2~
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
+f d28d87b88c1e24d637e390dc3603cfa7c1715711 .git/patches/master/series
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-1
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-1~
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-2~
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty~
+r bde3d337af70f36836ad606c800d194006f883b3 .git/refs/patches/master/empty-1
+% guilt pop
+All patches popped.
+% guilt delete -f empty-1
+% 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 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/nonempty~
+f 75c672c7dbec8e8275d26d720f499899d04912a4 .git/patches/master/nonempty-1~
+f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series
+f bbdc17918ad7ba268ea90ebf0fb71e32e0f09a02 .git/patches/master/nonempty-2~
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-1~
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-2~
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty~
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status
+%% empty + nonempty (diffstat=false)
+% guilt new empty
+% guilt pop
+All patches popped.
+% guilt push
+Applying patch..empty
+Patch applied.
+% guilt new -f -s -m A commit message. nonempty
+% guilt pop
+Now at empty.
+% guilt push
+Applying patch..nonempty
+Patch applied.
+% guilt pop
+Now at empty.
+% guilt fold nonempty
+% guilt pop
+All patches popped.
+% guilt push
+Applying patch..empty
+Patch applied.
+% list_files
+d .git/patches
+d .git/patches/master
+d .git/refs/patches
+d .git/refs/patches/master
+f 15aab0fd8b937eb3bb01841693f35dcb75da2faf .git/patches/master/status
+f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
+f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
+f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/empty
+f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/empty~
+f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/nonempty~
+f 75c672c7dbec8e8275d26d720f499899d04912a4 .git/patches/master/nonempty-1~
+f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
+f a26a22287b500a2a372e42c2bab03599bbe37cdf .git/patches/master/series
+f bbdc17918ad7ba268ea90ebf0fb71e32e0f09a02 .git/patches/master/nonempty-2~
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-1~
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-2~
+r 4eedaa32894fc07af3298d8c1178052942a3ca6a .git/refs/patches/master/empty
+% guilt pop
+All patches popped.
+% guilt delete -f empty
+% 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 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/empty~
+f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/nonempty~
+f 75c672c7dbec8e8275d26d720f499899d04912a4 .git/patches/master/nonempty-1~
+f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series
+f bbdc17918ad7ba268ea90ebf0fb71e32e0f09a02 .git/patches/master/nonempty-2~
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-1~
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-2~
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status
+%% nonempty + empty (diffstat=false)
+% guilt new -f -s -m A commit message. nonempty
+% guilt pop
+All patches popped.
+% guilt push
+Applying patch..nonempty
+Patch applied.
+% guilt new empty
+% guilt pop
+Now at nonempty.
+% guilt push
+Applying patch..empty
+Patch applied.
+% guilt pop
+Now at nonempty.
+% guilt fold empty
+% guilt pop
+All patches popped.
+% guilt push
+Applying patch..nonempty
+Patch applied.
+% 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 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/nonempty
+f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/nonempty~
+f 75c672c7dbec8e8275d26d720f499899d04912a4 .git/patches/master/nonempty-1~
+f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
+f bbdc17918ad7ba268ea90ebf0fb71e32e0f09a02 .git/patches/master/nonempty-2~
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
+f c47ddc01337e3bb67a9968a8823a5ba12be67f77 .git/patches/master/series
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-1~
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-2~
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty~
+f f7f068d44bf796d0f7cd14d27d1f48d6e659816a .git/patches/master/status
+r 4eedaa32894fc07af3298d8c1178052942a3ca6a .git/refs/patches/master/nonempty
+% guilt pop
+All patches popped.
+% guilt delete -f nonempty
+% 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 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/nonempty~
+f 75c672c7dbec8e8275d26d720f499899d04912a4 .git/patches/master/nonempty-1~
+f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series
+f bbdc17918ad7ba268ea90ebf0fb71e32e0f09a02 .git/patches/master/nonempty-2~
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-1~
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-2~
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty~
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status
+%% nonempty + nonempty (diffstat=false)
+% guilt new -f -s -m A commit message. nonempty-1
+% guilt pop
+All patches popped.
+% guilt push
+Applying patch..nonempty-1
+Patch applied.
+% guilt new -f -s -m Another commit message. nonempty-2
+% guilt pop
+Now at nonempty-1.
+% guilt push
+Applying patch..nonempty-2
+Patch applied.
+% guilt pop
+Now at nonempty-1.
+% guilt fold nonempty-2
+% guilt pop
+All patches popped.
+% guilt push
+Applying patch..nonempty-1
+Patch applied.
+% 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 3b526c794741fb2d6b463f3245ab2f260fa74b7b .git/patches/master/status
+f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
+f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/nonempty~
+f 75c672c7dbec8e8275d26d720f499899d04912a4 .git/patches/master/nonempty-1
+f 75c672c7dbec8e8275d26d720f499899d04912a4 .git/patches/master/nonempty-1~
+f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
+f a88f2625f128cfa307a52c8c2e84ed6c32a78d2b .git/patches/master/series
+f bbdc17918ad7ba268ea90ebf0fb71e32e0f09a02 .git/patches/master/nonempty-2~
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-1~
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-2~
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty~
+r 895dfbc21bde85fcc666a353a6bd32eaec939082 .git/refs/patches/master/nonempty-1
+% guilt pop
+All patches popped.
+% guilt delete -f nonempty-1
+% 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 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/nonempty~
+f 75c672c7dbec8e8275d26d720f499899d04912a4 .git/patches/master/nonempty-1~
+f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
+f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series
+f bbdc17918ad7ba268ea90ebf0fb71e32e0f09a02 .git/patches/master/nonempty-2~
+f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-1~
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-2~
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty~
+f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status
diff --git a/regression/t-035.sh b/regression/t-035.sh
new file mode 100755
index 0000000..c347e47
--- /dev/null
+++ b/regression/t-035.sh
@@ -0,0 +1,61 @@
+#!/bin/bash
+#
+# Test the fold code
+#
+
+source "$REG_DIR/scaffold"
+
+cmd setup_repo
+
+function fixup_time_info
+{
+ cmd guilt pop
+ touch -a -m -t "$TOUCH_DATE" ".git/patches/master/$1"
+ cmd guilt push
+}
+
+function empty_patch
+{
+ cmd guilt new "empty$1"
+ fixup_time_info "empty$1"
+}
+
+function nonempty_patch
+{
+ if [ "$1" = -2 ]; then
+ msg="Another commit message."
+ else
+ msg="A commit message."
+ fi
+
+ cmd guilt new -f -s -m "$msg" "nonempty$1"
+ fixup_time_info "nonempty$1"
+}
+
+for using_diffstat in true false; do
+ cmd git config guilt.diffstat $using_diffstat
+ for patcha in empty nonempty; do
+ for patchb in empty nonempty; do
+
+ if [ $patcha = $patchb ]; then
+ suffixa=-1
+ suffixb=-2
+ else
+ suffixa=
+ suffixb=
+ fi
+
+ echo "%% $patcha + $patchb (diffstat=$using_diffstat)"
+ ${patcha}_patch $suffixa
+ ${patchb}_patch $suffixb
+ cmd guilt pop
+ cmd guilt fold $patchb$suffixb
+ fixup_time_info $patcha$suffixa
+ cmd list_files
+ cmd guilt pop
+ cmd guilt delete -f $patcha$suffixa
+ cmd list_files
+
+ done
+ done
+done
--
1.8.3.1
next prev parent reply other threads:[~2014-05-18 22:05 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 ` Per Cederqvist [this message]
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 ` [GUILT v4 31/33] Don't use "git log -p" in the test suite Per Cederqvist
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-8-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).