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

Re: [PATCH v3 5/6] rebase -i: support --ignore-date

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 20, 2019, 17:42 UTC
Message-ID
<xmqqwof7vim6.fsf@gitster-ct.c.googlers.com>
In-Reply-To
<20190820034536.13071-6-rohit.ashiwal265@gmail.com>
Rohit Ashiwal <rohit.ashiwal265@gmail.com> writes:
> +/* Construct a free()able author string with current time as the author date */
> +static char *ignore_author_date(const char *author)
> +{
> +	int len = strlen(author);
Mental note: ignore_author_date() would not allow author==NULL as its input.
Show 12 quoted lines
> @@ -1020,10 +1047,20 @@ static int run_git_commit(struct repository *r,
>  
>  		if (res <= 0)
>  			res = error_errno(_("could not read '%s'"), defmsg);
> -		else
> +		else {
> +			if (opts->ignore_date) {
> +				char *new_author = ignore_author_date(author);
> +				if (!author)
> +					BUG("ignore-date can only be used with "
> +					    "rebase, which must set the author "
> +					    "before committing the tree");

Yet, author is used and then checked for NULL-ness, which is backwards. Before we have a chance to issue this BUG(), we would already have segfaulted inside ignore_author_date().

Previous: Phillip WoodNext: Phillip Wood
Message 54 of 96 in “[GSoC][PATCHl 0/6] rebase -i: support more options”
  1. Rohit AshiwalAug 6, 2019
  2. [GSoC][PATCHl 1/6] rebase -i: add --ignore-whitespace flagRohit Ashiwal, Aug 6, 2019
  3. Junio C HamanoAug 7, 2019
  4. Rohit AshiwalAug 7, 2019
  5. Phillip WoodAug 8, 2019
  6. Rohit AshiwalAug 12, 2019
  7. [GSoC][PATCHl 3/6] rebase -i: support --committer-date-is-author-dateRohit Ashiwal, Aug 6, 2019
  8. Phillip WoodAug 8, 2019
  9. Junio C HamanoAug 8, 2019
  10. [GSoC][PATCHl 2/6] sequencer: add NULL checks under read_author_scriptRohit Ashiwal, Aug 6, 2019
  11. [GSoC][PATCHl 4/6] sequencer: rename amend_author to author_to_renameRohit Ashiwal, Aug 6, 2019
  12. Phillip WoodAug 8, 2019
  13. [GSoC][PATCHl 5/6] rebase -i: support --ignore-dateRohit Ashiwal, Aug 6, 2019
  14. Johannes SchindelinAug 7, 2019
  15. Junio C HamanoAug 7, 2019
  16. Rohit AshiwalAug 7, 2019
  17. Phillip WoodAug 8, 2019
  18. Phillip WoodAug 8, 2019
  19. [GSoC][PATCHl 6/6] rebase: add --author-date-is-committer-dateRohit Ashiwal, Aug 6, 2019
  20. Phillip WoodAug 8, 2019
  21. [GSoC][PATCH v2 0/6] rebase -i: support more optionsRohit Ashiwal, Aug 12, 2019
  22. [GSoC][PATCH v2 1/6] rebase -i: add --ignore-whitespace flagRohit Ashiwal, Aug 12, 2019
  23. Phillip WoodAug 13, 2019
  24. [GSoC][PATCH v2 2/6] sequencer: add NULL checks under read_author_scriptRohit Ashiwal, Aug 12, 2019
  25. [GSoC][PATCH v2 3/6] rebase -i: support --committer-date-is-author-dateRohit Ashiwal, Aug 12, 2019
  26. Phillip WoodAug 13, 2019
  27. Phillip WoodAug 13, 2019
  28. Junio C HamanoAug 13, 2019
  29. Phillip WoodAug 14, 2019
  30. Phillip WoodAug 13, 2019
  31. [GSoC][PATCH v2 4/6] sequencer: rename amend_author to author_to_renameRohit Ashiwal, Aug 12, 2019
  32. Phillip WoodAug 13, 2019
  33. [GSoC][PATCH v2 5/6] rebase -i: support --ignore-dateRohit Ashiwal, Aug 12, 2019
  34. Phillip WoodAug 13, 2019
  35. Junio C HamanoAug 13, 2019
  36. Phillip WoodAug 14, 2019
  37. Junio C HamanoAug 13, 2019
  38. Phillip WoodAug 14, 2019
  39. Junio C HamanoAug 14, 2019
  40. Phillip WoodAug 17, 2019
  41. [GSoC][PATCH v2 6/6] rebase: add --author-date-is-committer-dateRohit Ashiwal, Aug 12, 2019
  42. Junio C HamanoAug 13, 2019
  43. 0/6 rebase -i: support more optionsRohit Ashiwal, Aug 20, 2019
  44. 1/6 rebase -i: add --ignore-whitespace flagRohit Ashiwal, Aug 20, 2019
  45. Phillip WoodAug 20, 2019
  46. Rohit AshiwalAug 20, 2019
  47. 2/6 sequencer: add NULL checks under read_author_scriptRohit Ashiwal, Aug 20, 2019
  48. Junio C HamanoAug 23, 2019
  49. 3/6 rebase -i: support --committer-date-is-author-dateRohit Ashiwal, Aug 20, 2019
  50. Phillip WoodAug 20, 2019
  51. 4/6 sequencer: rename amend_author to author_to_renameRohit Ashiwal, Aug 20, 2019
  52. 5/6 rebase -i: support --ignore-dateRohit Ashiwal, Aug 20, 2019
  53. Phillip WoodAug 20, 2019
  54. Junio C HamanoAug 20, 2019
  55. Phillip WoodAug 20, 2019
  56. [GSoC][PATCH v2 6/6] rebase: add --author-date-is-committer-dateRohit Ashiwal, Aug 20, 2019
  57. Rohit AshiwalAug 20, 2019
  58. 6/6 rebase: add --reset-author-dateRohit Ashiwal, Aug 20, 2019
  59. Rohit AshiwalAug 20, 2019
  60. Phillip WoodAug 20, 2019
  61. Junio C HamanoAug 20, 2019
  62. Phillip WoodAug 20, 2019
  63. 0/6 rebase -i: support more optionsRohit Ashiwal, Sep 7, 2019
  64. 1/6 rebase -i: add --ignore-whitespace flagRohit Ashiwal, Sep 7, 2019
  65. Phillip WoodOct 4, 2019
  66. Elijah NewrenOct 5, 2019
  67. Rohit AshiwalOct 6, 2019
  68. 2/6 sequencer: allow callers of read_author_script() to ignore fieldsRohit Ashiwal, Sep 7, 2019
  69. 3/6 rebase -i: support --committer-date-is-author-dateRohit Ashiwal, Sep 7, 2019
  70. Phillip WoodOct 4, 2019
  71. Rohit AshiwalOct 6, 2019
  72. Phillip WoodOct 24, 2019
  73. 4/6 sequencer: rename amend_author to author_to_renameRohit Ashiwal, Sep 7, 2019
  74. 5/6 rebase -i: support --ignore-dateRohit Ashiwal, Sep 7, 2019
  75. Rohit AshiwalSep 7, 2019
  76. Phillip WoodSep 27, 2019
  77. Rohit AshiwalOct 6, 2019
  78. Phillip WoodOct 24, 2019
  79. 6/6 rebase: add --reset-author-dateRohit Ashiwal, Sep 7, 2019
  80. Junio C HamanoSep 9, 2019
  81. Phillip WoodSep 9, 2019
  82. Junio C HamanoSep 9, 2019
  83. 0/6 rebase -i: support more optionsRohit Ashiwal, Nov 1, 2019
  84. 1/6 rebase -i: add --ignore-whitespace flagRohit Ashiwal, Nov 1, 2019
  85. 2/6 sequencer: allow callers of read_author_script() to ignore fieldsRohit Ashiwal, Nov 1, 2019
  86. 3/6 rebase -i: support --committer-date-is-author-dateRohit Ashiwal, Nov 1, 2019
  87. 4/6 sequencer: rename amend_author to author_to_renameRohit Ashiwal, Nov 1, 2019
  88. 5/6 rebase -i: support --ignore-dateRohit Ashiwal, Nov 1, 2019
  89. Junio C HamanoNov 2, 2019
  90. Junio C HamanoNov 2, 2019
  91. 6/6 rebase: add --reset-author-dateRohit Ashiwal, Nov 1, 2019
  92. Junio C HamanoNov 2, 2019
  93. Junio C HamanoNov 21, 2019
  94. Alban GruinNov 21, 2019
  95. Junio C HamanoNov 22, 2019
  96. Phillip WoodNov 28, 2019

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.