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

Re: [GSoC][PATCHl 5/6] rebase -i: support --ignore-date

From
PWPhillip Wood <phillip.wood123@gmail.com>
Date
Aug 8, 2019, 16:53 UTC
Message-ID
<24577efb-a959-04b1-c202-284571c5505e@gmail.com>
In-Reply-To
<0619f7b7-a7e5-54a2-3d28-ac359139bde7@gmail.com>
On 08/08/2019 12:42, Phillip Wood wrote:
Show 7 quoted lines
> On 06/08/2019 18:36, Rohit Ashiwal wrote:
>> rebase am already has this flag to "lie" about the author date
>> by changing it to the committer (current) date. Let's add the same
>> for interactive machinery.
>>
>> Signed-off-by: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
>> ---
 >> [...[
Show 16 quoted lines
>>   static const char staged_changes_advice[] =
>>   N_("you have staged changes in your working tree\n"
>>   "If these changes are meant to be squashed into the previous commit, 
>> run:\n"
>> @@ -985,7 +997,7 @@ static int run_git_commit(struct repository *r,
>>   {
>>       struct child_process cmd = CHILD_PROCESS_INIT;
>> -    if (opts->committer_date_is_author_date &&
>> +    if (opts->committer_date_is_author_date && !opts->ignore_date &&
>>           setenv_committer_date_to_author_date())
>>           return 1;
> 
> We read the author script again just below, can set the committer date 
> there by parsing the author string, that would mean you could use the 
> same function that works on an author string in try_to_commit() (this 
> comment should be on patch 3 I think)

It's a bit more complicated as you've done this to avoid the duplication in the previous version. I think it should be possible to do it by reading the author identity upfront (protected by 'if is_rebase_i(opts)') and processing it appropriately in the two code paths. (You might need to refactor some of the functions like read_env_script() to do this.) An alternative would be to refactor try_to_commit() so that it can create the root commit and delete the code here that does that.

Best Wishes
Phillip
Show 153 quoted lines
> 
>>       if ((flags & CREATE_ROOT_COMMIT) && !(flags & AMEND_MSG)) {
>> @@ -1013,10 +1025,18 @@ 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) {
>> +                if (!author)
>> +                    BUG("ignore-date can only be used with "
>> +                        "rebase -i, which must set the "
> 
> I know it's only a bug message but it's not just 'rebase -i' but 'rebase 
> -k', 'rebase -m' ... that use this code path, it would be better just to 
> say 'rebase'
> 
>> +                        "author before committing the tree");
>> +                ignore_author_date(&author);
>> +            }
>>               res = commit_tree(msg.buf, msg.len, cache_tree_oid,
>>                         NULL, &root_commit, author,
>>                         opts->gpg_sign);
>> +        }
>>           strbuf_release(&msg);
>>           strbuf_release(&script);
>> @@ -1046,6 +1066,8 @@ static int run_git_commit(struct repository *r,
>>           argv_array_push(&cmd.args, "--amend");
>>       if (opts->gpg_sign)
>>           argv_array_pushf(&cmd.args, "-S%s", opts->gpg_sign);
>> +    if (opts->ignore_date)
>> +        argv_array_pushf(&cmd.args, "--date=%ld", time(NULL));
> 
> I think this is racy as it only sets the author date, the committer date 
> may end up being different.
> 
>>       if (defmsg)
>>           argv_array_pushl(&cmd.args, "-F", defmsg, NULL);
>>       else if (!(flags & EDIT_MSG))
>> @@ -1425,7 +1447,7 @@ static int try_to_commit(struct repository *r,
>>       if (parse_head(r, &current_head))
>>           return -1;
>>       if (!(flags & AMEND_MSG) && opts->committer_date_is_author_date &&
>> -        setenv_committer_date_to_author_date())
>> +        !opts->ignore_date && setenv_committer_date_to_author_date())
>>           return -1;
>>       if (flags & AMEND_MSG) {
>>           const char *exclude_gpgsig[] = { "gpgsig", NULL };
>> @@ -1447,7 +1469,7 @@ static int try_to_commit(struct repository *r,
>>               res = error(_("unable to parse commit author"));
>>               goto out;
>>           }
>> -        if (opts->committer_date_is_author_date) {
>> +        if (opts->committer_date_is_author_date && !opts->ignore_date) {
> 
> If we only handled committer_date_is_author_date in a single place it 
> wouldn't need to be changed twice in this patch
> 
>>               char *date;
>>               int len = strlen(author);
>>               char *idx = memchr(author, '>', len);
>> @@ -1507,6 +1529,11 @@ static int try_to_commit(struct repository *r,
>>       reset_ident_date();
>> +    if (opts->ignore_date) {
>> +        ignore_author_date(&author);
>> +        free(author_to_free);
>> +        author_to_free = (char *)author;
>> +    }
>>       if (commit_tree_extended(msg->buf, msg->len, &tree, parents,
>>                    oid, author, opts->gpg_sign, extra)) {
>>           res = error(_("failed to write commit object"));
>> @@ -2583,6 +2610,11 @@ static int read_populate_opts(struct 
>> replay_opts *opts)
>>               opts->committer_date_is_author_date = 1;
>>           }
>> +        if (file_exists(rebase_path_ignore_date())) {
>> +            opts->allow_ff = 0;
>> +            opts->ignore_date = 1;
>> +        }
>> +
>>           if (file_exists(rebase_path_reschedule_failed_exec()))
>>               opts->reschedule_failed_exec = 1;
>> @@ -2667,6 +2699,8 @@ int write_basic_state(struct replay_opts *opts, 
>> const char *head_name,
>>           write_file(rebase_path_signoff(), "--signoff\n");
>>       if (opts->committer_date_is_author_date)
>>           write_file(rebase_path_cdate_is_adate(), "%s", "");
>> +    if (opts->ignore_date)
>> +        write_file(rebase_path_ignore_date(), "%s", "");
>>       if (opts->reschedule_failed_exec)
>>           write_file(rebase_path_reschedule_failed_exec(), "%s", "");
>> @@ -3484,6 +3518,9 @@ static int do_merge(struct repository *r,
>>           argv_array_push(&cmd.args, git_path_merge_msg(r));
>>           if (opts->gpg_sign)
>>               argv_array_push(&cmd.args, opts->gpg_sign);
>> +        if (opts->ignore_date)
>> +            argv_array_pushf(&cmd.args,
>> +                     "GIT_AUTHOR_DATE=%ld", time(NULL));
>>           /* Add the tips to be merged */
>>           for (j = to_merge; j; j = j->next)
>> @@ -3756,7 +3793,8 @@ static int pick_commits(struct repository *r,
>>       if (opts->allow_ff)
>>           assert(!(opts->signoff || opts->no_commit ||
>>                   opts->record_origin || opts->edit ||
>> -                opts->committer_date_is_author_date));
>> +                opts->committer_date_is_author_date ||
>> +                opts->ignore_date));
>>       if (read_and_refresh_cache(r, opts))
>>           return -1;
>> diff --git a/sequencer.h b/sequencer.h
>> index e6cba468db..73d0515a3e 100644
>> --- a/sequencer.h
>> +++ b/sequencer.h
>> @@ -44,6 +44,7 @@ struct replay_opts {
>>       int quiet;
>>       int reschedule_failed_exec;
>>       int committer_date_is_author_date;
>> +    int ignore_date;
>>       int mainline;
>> diff --git a/t/t3433-rebase-options-compatibility.sh 
>> b/t/t3433-rebase-options-compatibility.sh
>> index ceab48a831..95d99c4b7b 100755
>> --- a/t/t3433-rebase-options-compatibility.sh
>> +++ b/t/t3433-rebase-options-compatibility.sh
>> @@ -81,4 +81,20 @@ test_expect_success 
>> '--committer-date-is-author-date works with interactive back
>>       test_cmp authortime committertime
>>   '
>> +# Checking for +0000 in author time is enough since default
>> +# timezone is UTC, but the timezone used while committing
>> +# sets to +0530.
> 
> That sounds potentially fragile but I guess the timezone is unlikely to 
> change in the future
> 
> Best Wishes
> 
> Phillip
> 
>> +test_expect_success '--ignore-date works with am backend' '
>> +    git commit --amend --date="$GIT_AUTHOR_DATE" &&
>> +    git rebase --ignore-date HEAD^ &&
>> +    git show HEAD --pretty="format:%ai" >authortime &&
>> +    grep "+0000" authortime
>> +'
>> +
>> +test_expect_success '--ignore-date works with interactive backend' '
>> +    git commit --amend --date="$GIT_AUTHOR_DATE" &&
>> +    git rebase --ignore-date -i HEAD^ &&
>> +    git show HEAD --pretty="format:%ai" >authortime &&
>> +    grep "+0000" authortime
>> +'
>>   test_done
>>
Previous: Phillip WoodNext: Rohit Ashiwal
Message 18 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.