--- oslo-series-v2/v2-0008-Added-more-test-cases-for-guilt-new-empty-patches.patch +++ oslo-series-v3/v3-0008-Added-more-test-cases-for-guilt-new-empty-patches.patch @@ -1,7 +1,7 @@ -From 746e99819022fbba7e2f4f5ac8f8b8ce7210b872 Mon Sep 17 00:00:00 2001 +From 5187539324c7069db6ad3c7215ca02055154b81e Mon Sep 17 00:00:00 2001 From: Per Cederqvist -Date: Tue, 13 May 2014 21:03:44 +0200 -Subject: [GUILT v2 08/29] Added more test cases for "guilt new": empty +Date: Wed, 14 May 2014 22:34:22 +0200 +Subject: [GUILT v3 08/31] Added more test cases for "guilt new": empty patches. To: Jeff Sipek Cc: git@vger.kernel.org @@ -11,7 +11,7 @@ Signed-off-by: Per Cederqvist --- - regression/t-020.out | 250 +++++++++++++++++++++++++++++++++++++++++++++++++++ - regression/t-020.sh | 60 +++++++++++++ - 2 files changed, 310 insertions(+) + regression/t-020.out | 269 +++++++++++++++++++++++++++++++++++++++++++++++++++ + regression/t-020.sh | 60 ++++++++++++ + 2 files changed, 329 insertions(+) diff --git a/regression/t-020.out b/regression/t-020.out index af45734..7e07efa 100644 --- a/regression/t-020.out +++ b/regression/t-020.out - @@ -1128,3 +1128,253 @@ f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add + @@ -1128,3 +1128,272 @@ f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status [...] +@@ -0,0 +1 @@ ++abc +% git config guilt.diffstat false - +--- - + - +% guilt pop - +All patches popped. - +% guilt push - +Applying patch..empty.patch - +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 7d261b8caad0f161c21daf5de65eeb521ff8c067 .git/patches/master/empty.patch + +% guilt pop + +All patches popped. + +% guilt push + +Applying patch..empty.patch + +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 7ad87a0bdb8cf0a57cfc384633edabbb9c2bfa1b .git/patches/master/empty.patch +f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add +f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify +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 - +Date: Mon Jan 1 00:00:00 2007 +0000 - + - + patch empty.patch + +r 8ed27228b117c0c88abf3d586bcc43c68e975cea .git/refs/patches/master/empty.patch + +% git log -p + +commit 8ed27228b117c0c88abf3d586bcc43c68e975cea + +Author: Per Cederqvist + +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 [...] +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 7d261b8caad0f161c21daf5de65eeb521ff8c067 .git/patches/master/empty.patch - +f 7d261b8caad0f161c21daf5de65eeb521ff8c067 .git/patches/master/empty.patch~ - +f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add - +f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify - +f d15a1d2d34493f790c78ddacb8815b0b9536ee2b .git/patches/master/series - +f e90b964f01cbef60bbe00c38c55d9ea86618a66a .git/patches/master/status - +r c7a139f532a43c3c8b0e068cac04f8f6af0f94e1 .git/refs/patches/master/empty.patch - +% git log -p - +commit c7a139f532a43c3c8b0e068cac04f8f6af0f94e1 - +Author: Author Name - +Date: Mon Jan 1 00:00:00 2007 +0000 - + - + patch empty.patch + +f 0803c721968056410df61400bb239380d033b9d5 .git/patches/master/empty.patch + +f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode + +f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove + +f 7ad87a0bdb8cf0a57cfc384633edabbb9c2bfa1b .git/patches/master/empty.patch~ + +f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add + +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 + +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 [...] +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 7d261b8caad0f161c21daf5de65eeb521ff8c067 .git/patches/master/empty.patch~ - +f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add - +f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify - +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 - +Date: Mon Jan 1 00:00:00 2007 +0000 - + - + patch empty.patch + +f 0803c721968056410df61400bb239380d033b9d5 .git/patches/master/empty.patch~ + +f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode + +f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove + +f 7ad87a0bdb8cf0a57cfc384633edabbb9c2bfa1b .git/patches/master/empty.patch + +f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add + +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 + +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 [...] +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 7d261b8caad0f161c21daf5de65eeb521ff8c067 .git/patches/master/empty.patch~ + +f 0803c721968056410df61400bb239380d033b9d5 .git/patches/master/empty.patch~ + +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 [...] ++++ b/def +@@ -0,0 +1 @@ ++abc diff --git a/regression/t-020.sh b/regression/t-020.sh index cdd08ba..906aec6 100755 --- a/regression/t-020.sh +++ b/regression/t-020.sh @@ -69,6 +76,59 @@ done cmd list_files [...] +cmd git config guilt.diffstat false + +# Let the patch have a commit message, but no data. - +cat .git/patches/master/empty.patch < .git/patches/master/empty.patch < [...] # --all # -a --