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

Re: [GUILT 21/28] The log.decorate setting should not influence import-commit.

From
JSJeff Sipek <jeffpc@josefsipek.net>
Date
May 6, 2014, 20:41 UTC
Message-ID
<20140506204114.GR1655@meili.valhalla.31bits.net>
In-Reply-To
<1395387126-13681-22-git-send-email-cederp@opera.com>
Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
On Fri, Mar 21, 2014 at 08:31:59AM +0100, Per Cederqvist wrote:
Show 63 quoted lines
> Use --no-decorate in the call to git log that tries to read the commit
> message to produce patch names.  Otherwise, if the user has set
> log.decorate to short or full, the patch name will be less useful.
> 
> Modify the t-034.sh test case to demonstrate that this is needed.
> 
> Signed-off-by: Per Cederqvist <cederp@opera.com>
> ---
>  guilt-import-commit  | 2 +-
>  regression/t-034.out | 2 ++
>  regression/t-034.sh  | 2 ++
>  3 files changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/guilt-import-commit b/guilt-import-commit
> index 6eb2f4e..703f034 100755
> --- a/guilt-import-commit
> +++ b/guilt-import-commit
> @@ -26,7 +26,7 @@ disp "About to begin conversion..." >&2
>  disp "Current head: `cat \"$GIT_DIR\"/refs/heads/\`git_branch\``" >&2
>  
>  for rev in `git rev-list $rhash`; do
> -	s=`git log --pretty=oneline -1 $rev | cut -c 42-`
> +	s=`git log --no-decorate --pretty=oneline -1 $rev | cut -c 42-`
>  
>  	# Try to convert the first line of the commit message to a
>  	# valid patch name.
> diff --git a/regression/t-034.out b/regression/t-034.out
> index bda4399..5d81bd4 100644
> --- a/regression/t-034.out
> +++ b/regression/t-034.out
> @@ -232,6 +232,7 @@ Date:   Mon Jan 1 00:00:00 2007 +0000
>      
>      Signed-off-by: Commiter Name <commiter@email>
>  % guilt init
> +% git config log.decorate short
>  % guilt import-commit base..HEAD
>  About to begin conversion...
>  Current head: 2a8b1889aa5066193bac978e6bf5073ffcfa6541
> @@ -259,6 +260,7 @@ Converting 45e81b51 as the_sequence_.lock-_is_forbidden
>  Converting eebb76e9 as the_sequence_-._is_forbidden
>  Done.
>  Current head: d4850419ccc1146c7169f500725ce504b9774ed0
> +% git config log.decorate no
>  % guilt push -a
>  Applying patch..the_sequence_-._is_forbidden.patch
>  Patch applied.
> diff --git a/regression/t-034.sh b/regression/t-034.sh
> index 1055ddb..8179bc7 100755
> --- a/regression/t-034.sh
> +++ b/regression/t-034.sh
> @@ -57,7 +57,9 @@ cmd git log
>  
>  # Import all the commits to guilt.
>  cmd guilt init
> +cmd git config log.decorate short
>  cmd guilt import-commit base..HEAD
> +cmd git config log.decorate no
>  
>  for patch in .git/patches/master/*.patch
>  do
> -- 
> 1.8.3.1
> 
-- 
Evolution, n.:
  A hypothetical process whereby infinitely improbable events occur with
  alarming frequency, order arises from chaos, and no one is given credit.
Previous: Per CederqvistNext: Per Cederqvist
Message 47 of 61 in “[GUILT 00/28] Teach guilt import-commit how create legal patch names, and more”
  1. Per CederqvistMar 21, 2014
  2. 01/28 The tests should not fail if guilt.diffstat is set.Per Cederqvist, Mar 21, 2014
  3. 02/28 Allow "guilt delete -f" to run from a dir which contains spaces.Per Cederqvist, Mar 21, 2014
  4. 03/28 Added test case for "guilt delete -f".Per Cederqvist, Mar 21, 2014
  5. 04/28 Allow "guilt import-commit" to run from a dir which contains spaces.Per Cederqvist, Mar 21, 2014
  6. Jeff SipekMar 23, 2014
  7. Per CederqvistMar 23, 2014
  8. Jeff SipekMar 23, 2014
  9. Per CederqvistMar 23, 2014
  10. Jeff SipekMay 6, 2014
  11. 05/28 "guilt new": Accept more than 4 arguments.Per Cederqvist, Mar 21, 2014
  12. 06/28 Fix and simplify the do_get_patch function.Per Cederqvist, Mar 21, 2014
  13. Jeff SipekMar 23, 2014
  14. Per CederqvistMar 23, 2014
  15. Jeff SipekMay 6, 2014
  16. Per CederqvistMay 7, 2014
  17. 07/28 Added test cases for "guilt fold".Per Cederqvist, Mar 21, 2014
  18. Jeff SipekMay 6, 2014
  19. Per CederqvistMay 7, 2014
  20. Jeff SipekMay 7, 2014
  21. Per CederqvistMay 8, 2014
  22. Jeff SipekMay 8, 2014
  23. 08/28 Added more test cases for "guilt new": empty patches.Per Cederqvist, Mar 21, 2014
  24. 09/28 Test suite: properly check the exit status of commands.Per Cederqvist, Mar 21, 2014
  25. 10/28 Run test_failed if the exit status of a test script is bad.Per Cederqvist, Mar 21, 2014
  26. Jeff SipekMay 6, 2014
  27. 11/28 test suite: remove pointless redirection.Per Cederqvist, Mar 21, 2014
  28. Jeff SipekMay 6, 2014
  29. 12/28 "guilt header": more robust header selection.Per Cederqvist, Mar 21, 2014
  30. 13/28 Check that "guilt header '.*'" fails.Per Cederqvist, Mar 21, 2014
  31. 14/28 Use "git check-ref-format" to validate patch names.Per Cederqvist, Mar 21, 2014
  32. 15/28 Produce legal patch names in guilt-import-commit.Per Cederqvist, Mar 21, 2014
  33. 16/28 Fix backslash handling when creating names of imported patches.Per Cederqvist, Mar 21, 2014
  34. 17/28 "guilt graph" no longer loops when no patches are applied.Per Cederqvist, Mar 21, 2014
  35. Jeff SipekMay 6, 2014
  36. 18/28 guilt-graph: Handle commas in branch names.Per Cederqvist, Mar 21, 2014
  37. Jeff SipekMay 6, 2014
  38. 19/28 Check that "guilt graph" works when working on a branch with a comma.Per Cederqvist, Mar 21, 2014
  39. Jeff SipekMay 6, 2014
  40. Jeff SipekMay 13, 2014
  41. Jeff SipekMay 13, 2014
  42. 20/28 "guilt graph": Handle patch names containing quotes.Per Cederqvist, Mar 21, 2014
  43. Eric SunshineMar 21, 2014
  44. Jeff SipekMay 6, 2014
  45. Per CederqvistMay 8, 2014
  46. 21/28 The log.decorate setting should not influence import-commit.Per Cederqvist, Mar 21, 2014
  47. Jeff SipekMay 6, 2014
  48. 22/28 The log.decorate setting should not influence patchbomb.Per Cederqvist, Mar 21, 2014
  49. Jeff SipekMay 6, 2014
  50. 23/28 The log.decorate setting should not influence guilt rebase.Per Cederqvist, Mar 21, 2014
  51. Jeff SipekMay 6, 2014
  52. 24/28 disp no longer processes backslashes.Per Cederqvist, Mar 21, 2014
  53. Jeff SipekMay 7, 2014
  54. 25/28 "guilt push" now fails when there are no more patches to push.Per Cederqvist, Mar 21, 2014
  55. Jeff SipekMay 7, 2014
  56. Per CederqvistMay 8, 2014
  57. 26/28 "guilt pop" now fails when there are no more patches to pop.Per Cederqvist, Mar 21, 2014
  58. 27/28 Minor testsuite fix.Per Cederqvist, Mar 21, 2014
  59. Jeff SipekMay 7, 2014
  60. 28/28 Added guilt.reusebranch configuration option.Per Cederqvist, Mar 21, 2014
  61. Jeff SipekMar 21, 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.