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

Re: [GUILT v3 08/31] Added more test cases for "guilt new": empty patches.

From
JSJeff Sipek <jeffpc@josefsipek.net>
Date
May 16, 2014, 15:01 UTC
Message-ID
<20140516150150.GC1770@meili.valhalla.31bits.net>
In-Reply-To
<1400251578-17221-9-git-send-email-cederp@opera.com>
Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
On Fri, May 16, 2014 at 04:45:55PM +0200, Per Cederqvist wrote:
Show 367 quoted lines
> Test that empty patches are handled correctly, both with and without
> the guilt.diffstat configuration option.
> 
> Signed-off-by: Per Cederqvist <cederp@opera.com>
> ---
>  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..42433dc 100644
> --- a/regression/t-020.out
> +++ b/regression/t-020.out
> @@ -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
> +% guilt new 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 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 <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
> +% 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
> +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 <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.
> +% 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 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
> +% 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 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 <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
> +% 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 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 <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
> +All patches popped.
> +% guilt delete -f empty.patch
> +% list_files
> +d .git/patches
> +d .git/patches/master
> +d .git/refs/patches
> +d .git/refs/patches/master
> +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
> +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 cdd08ba..c165884 100755
> --- a/regression/t-020.sh
> +++ b/regression/t-020.sh
> @@ -5,6 +5,13 @@
>  
>  source "$REG_DIR/scaffold"
>  
> +function fixup_time_info
> +{
> +	cmd guilt pop
> +	touch -a -m -t "$TOUCH_DATE" ".git/patches/master/$1"
> +	cmd guilt push
> +}
> +
>  cmd setup_repo
>  
>  #
> @@ -69,6 +76,59 @@ done
>  
>  cmd list_files
>  
> +# push an empty patch with no commit message
> +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.
> +cat > .git/patches/master/empty.patch <<EOF
> +Fix a bug.
> +
> +From: Per Cederqvist <ceder@lysator.liu.se>
> +
> +This commit fixes a serious bug.
> +
> +FIXME:
> +    - add a test case
> +    - track down the bug
> +    - actually fix it
> +EOF
> +
> +fixup_time_info empty.patch
> +cmd list_files
> +cmd git log -p
> +
> +# And once more, with an empty diffstat.
> +
> +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
>  #   -a
> -- 
> 1.8.3.1
> 
-- 
mainframe, n.:
  An obsolete device still used by thousands of obsolete companies serving
  billions of obsolete customers and making huge obsolete profits for their
  obsolete shareholders. And this year's run twice as fast as last year's.
Previous: Per CederqvistNext: Per Cederqvist
Message 10 of 41 in “[GUILT v3 00/31] Teach guilt import-commit how to create legal patch names, and more”
  1. Per CederqvistMay 16, 2014
  2. 01/31 The tests should not fail if guilt.diffstat is set.Per Cederqvist, May 16, 2014
  3. 02/31 Allow "guilt delete -f" to run from a dir which contains spaces.Per Cederqvist, May 16, 2014
  4. 03/31 Added test case for "guilt delete -f".Per Cederqvist, May 16, 2014
  5. 04/31 Allow "guilt import-commit" to run from a dir which contains spaces.Per Cederqvist, May 16, 2014
  6. 05/31 "guilt new": Accept more than 4 arguments.Per Cederqvist, May 16, 2014
  7. 06/31 Fix the do_get_patch function.Per Cederqvist, May 16, 2014
  8. 07/31 Added test cases for "guilt fold".Per Cederqvist, May 16, 2014
  9. 08/31 Added more test cases for "guilt new": empty patches.Per Cederqvist, May 16, 2014
  10. Jeff SipekMay 16, 2014
  11. 09/31 Test suite: properly check the exit status of commands.Per Cederqvist, May 16, 2014
  12. Jeff SipekMay 16, 2014
  13. Per CederqvistMay 18, 2014
  14. 10/31 Run test_failed if the exit status of a test script is bad.Per Cederqvist, May 16, 2014
  15. 11/31 test suite: remove pointless redirection.Per Cederqvist, May 16, 2014
  16. 12/31 "guilt header": more robust header selection.Per Cederqvist, May 16, 2014
  17. Jeff SipekMay 16, 2014
  18. 13/31 Check that "guilt header '.*'" fails.Per Cederqvist, May 16, 2014
  19. 14/31 Use "git check-ref-format" to validate patch names.Per Cederqvist, May 16, 2014
  20. Jeff SipekMay 16, 2014
  21. Per CederqvistMay 18, 2014
  22. 15/31 Produce legal patch names in guilt-import-commit.Per Cederqvist, May 16, 2014
  23. 16/31 Fix backslash handling when creating names of imported patches.Per Cederqvist, May 16, 2014
  24. 17/31 "guilt graph" no longer loops when no patches are applied.Per Cederqvist, May 16, 2014
  25. 18/31 guilt-graph: Handle commas in branch names.Per Cederqvist, May 16, 2014
  26. 19/31 Check that "guilt graph" works when working on a branch with a comma.Per Cederqvist, May 16, 2014
  27. 20/31 "guilt graph": Handle patch names containing quotes.Per Cederqvist, May 16, 2014
  28. 21/31 The log.decorate setting should not influence import-commit.Per Cederqvist, May 16, 2014
  29. 22/31 The log.decorate setting should not influence patchbomb.Per Cederqvist, May 16, 2014
  30. 23/31 The log.decorate setting should not influence guilt rebase.Per Cederqvist, May 16, 2014
  31. 24/31 disp no longer processes backslashes.Per Cederqvist, May 16, 2014
  32. 25/31 "guilt push" now fails when there are no more patches to push.Per Cederqvist, May 16, 2014
  33. 26/31 "guilt pop" now fails when there are no more patches to pop.Per Cederqvist, May 16, 2014
  34. 27/31 Minor testsuite fix.Per Cederqvist, May 16, 2014
  35. 28/31 Fix coding style errors in t-061.sh.Per Cederqvist, May 16, 2014
  36. Jeff SipekMay 16, 2014
  37. 29/31 Added guilt.reusebranch configuration option.Per Cederqvist, May 16, 2014
  38. Jeff SipekMay 16, 2014
  39. 30/31 Added a short style guide, and Emacs settings.Per Cederqvist, May 16, 2014
  40. 31/31 Don't use "git log -p" in the test suite.Per Cederqvist, May 16, 2014
  41. Jeff SipekMay 16, 2014

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

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