From: Phillip Wood <phillip.wood123@gmail.com>
To: "Đoàn Trần Công Danh" <congdanhqx@gmail.com>,
"Phillip Wood" <phillip.wood@dunelm.org.uk>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Junio C Hamano <gitster@pobox.com>,
Elijah Newren <newren@gmail.com>,
Rohit Ashiwal <rohit.ashiwal265@gmail.com>,
Alban Gruin <alban.gruin@gmail.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH v5 4/5] rebase -i: support --ignore-date
Date: Fri, 26 Jun 2020 15:38:38 +0100 [thread overview]
Message-ID: <d0d8dcb2-6714-f0a6-61a3-55c5e0b6ab19@gmail.com> (raw)
In-Reply-To: <20200626140854.GC12504@danh.dev>
Hi Danh
On 26/06/2020 15:09, Đoàn Trần Công Danh wrote:
> On 2020-06-26 10:55:27+0100, Phillip Wood <phillip.wood123@gmail.com> wrote:
>> From: Phillip Wood <phillip.wood@dunelm.org.uk>
>>
>> Rebase is implemented with two different backends - 'apply' and
>> 'merge' each of which support a different set of options. In
>> particular the apply backend supports a number of options implemented
>> by 'git am' that are not implemented in the merge backend. This means
>> that the available options are different depending on which backend is
>> used which is confusing. This patch adds support for the --ignore-date
>> option to the merge backend. This option uses the current time as the
>> author date rather than reusing the original author date when
>> rewriting commits. We take care to handle the combination of
>> --ignore-date and --committer-date-is-author-date in the same way as
>> the apply backend.
>>
>> Original-patch-by: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
>> Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
>> ---
>> Documentation/git-rebase.txt | 7 +++--
>> builtin/rebase.c | 13 +++++---
>> sequencer.c | 50 ++++++++++++++++++++++++++++--
>> sequencer.h | 1 +
>> t/t3436-rebase-more-options.sh | 56 ++++++++++++++++++++++++++++++++++
>> 5 files changed, 117 insertions(+), 10 deletions(-)
>>
>> diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
>> index dfa70263e6..e2717e20e6 100644
>> --- a/Documentation/git-rebase.txt
>> +++ b/Documentation/git-rebase.txt
>> @@ -450,8 +450,9 @@ See also INCOMPATIBLE OPTIONS below.
>> date. This option implies --force-rebase.
>>
>> --ignore-date::
>> - This flag is passed to 'git am' to change the author date
>> - of each rebased commit (see linkgit:git-am[1]).
>> + Instead of using the author date of the original commit, use
>> + the current time as the author date of the rebased commit. This
>> + option implies `--force-rebase`.
>> +
>> See also INCOMPATIBLE OPTIONS below.
>>
>> @@ -589,7 +590,6 @@ INCOMPATIBLE OPTIONS
>> The following options:
>>
>> * --apply
>> - * --ignore-date
>> * --whitespace
>> * -C
>>
>> @@ -617,6 +617,7 @@ In addition, the following pairs of options are incompatible:
>> * --preserve-merges and --empty=
>> * --preserve-merges and --ignore-whitespace
>> * --preserve-merges and --committer-date-is-author-date
>> + * --preserve-merges and --ignore-date
>> * --keep-base and --onto
>> * --keep-base and --root
>>
>> diff --git a/builtin/rebase.c b/builtin/rebase.c
>> index a7c3d5c92b..890dd4c588 100644
>> --- a/builtin/rebase.c
>> +++ b/builtin/rebase.c
>> @@ -89,6 +89,7 @@ struct rebase_options {
>> char *gpg_sign_opt;
>> int autostash;
>> int committer_date_is_author_date;
>> + int ignore_date;
>> char *cmd;
>> int allow_empty_message;
>> int rebase_merges, rebase_cousins;
>> @@ -127,6 +128,7 @@ static struct replay_opts get_replay_opts(const struct rebase_options *opts)
>> replay.reschedule_failed_exec = opts->reschedule_failed_exec;
>> replay.committer_date_is_author_date =
>> opts->committer_date_is_author_date;
>> + replay.ignore_date = opts->ignore_date;
>> replay.gpg_sign = xstrdup_or_null(opts->gpg_sign_opt);
>> replay.strategy = opts->strategy;
>>
>> @@ -1503,8 +1505,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
>> OPT_BOOL(0, "committer-date-is-author-date",
>> &options.committer_date_is_author_date,
>> N_("make committer date match author date")),
>> - OPT_PASSTHRU_ARGV(0, "ignore-date", &options.git_am_opts, NULL,
>> - N_("passed to 'git am'"), PARSE_OPT_NOARG),
>> + OPT_BOOL(0, "ignore-date", &options.ignore_date,
>> + "ignore author date and use current date"),
>
> Nit: The options' description is subjected to l10n.
>
> s/".*"/N_(&)/
Well spotted, thanks
>> OPT_PASSTHRU_ARGV('C', NULL, &options.git_am_opts, N_("n"),
>> N_("passed to 'git apply'"), 0),
>> OPT_BOOL(0, "ignore-whitespace", &ignore_whitespace,
>> @@ -1797,13 +1799,12 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
>> options.autosquash) {
>> allow_preemptive_ff = 0;
>> }
>> - if (options.committer_date_is_author_date)
>> + if (options.committer_date_is_author_date || options.ignore_date)
>> options.flags |= REBASE_FORCE;
>>
>> for (i = 0; i < options.git_am_opts.argc; i++) {
>> const char *option = options.git_am_opts.argv[i], *p;
>> - if (!strcmp(option, "--ignore-date") ||
>> - !strcmp(option, "--whitespace=fix") ||
>> + if (!strcmp(option, "--whitespace=fix") ||
>> !strcmp(option, "--whitespace=strip"))
>> allow_preemptive_ff = 0;
>> else if (skip_prefix(option, "-C", &p)) {
>> @@ -1862,6 +1863,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
>> if (options.committer_date_is_author_date)
>> argv_array_push(&options.git_am_opts,
>> "--committer-date-is-author-date");
>> + if (options.ignore_date)
>> + argv_array_push(&options.git_am_opts, "--ignore-date");
>> } else if (ignore_whitespace) {
>> string_list_append (&strategy_options,
>> "ignore-space-change");
>> diff --git a/sequencer.c b/sequencer.c
>> index 29f6d1bc39..f8e1e38623 100644
>> --- a/sequencer.c
>> +++ b/sequencer.c
>> @@ -150,6 +150,7 @@ static GIT_PATH_FUNC(rebase_path_refs_to_delete, "rebase-merge/refs-to-delete")
>> */
>> static GIT_PATH_FUNC(rebase_path_gpg_sign_opt, "rebase-merge/gpg_sign_opt")
>> static GIT_PATH_FUNC(rebase_path_cdate_is_adate, "rebase-merge/cdate_is_adate")
>> +static GIT_PATH_FUNC(rebase_path_ignore_date, "rebase-merge/ignore_date")
>> static GIT_PATH_FUNC(rebase_path_orig_head, "rebase-merge/orig-head")
>> static GIT_PATH_FUNC(rebase_path_verbose, "rebase-merge/verbose")
>> static GIT_PATH_FUNC(rebase_path_quiet, "rebase-merge/quiet")
>> @@ -889,6 +890,24 @@ static const char *author_date_from_env_array(const struct argv_array *env)
>> BUG("GIT_AUTHOR_DATE missing from author script");
>> }
>>
>> +/* 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);
>> + struct ident_split ident;
>> + struct strbuf new_author = STRBUF_INIT;
>> +
>> + if (split_ident_line(&ident, author, len) < 0) {
>> + error(_("malformed ident line '%s'"), author);
>> + return NULL;
>> + }
>> +
>> + len = ident.mail_end - ident.name_begin + 1;
>> + strbuf_addf(&new_author, "%.*s ", len, ident.name_begin);
>
> I wonder if we can do this instead:
>
> strbuf_add(&new_author, ident.name_begin, len);
There is a space at the end of the format string, which I think is
needed to separate the name and email from the date we add with
datestamp() below
Best Wishes
Phillip
> Quick skim through the code and nothing crashes when make test with:
>
> CFLAGS="-fstack-clash-protection -D_FORTIFY_SOURCE=2"
>
> I think it's OK to be changed.
>
>> + datestamp(&new_author);
>> + return strbuf_detach(&new_author, NULL);
>> +}
>> +
>
next prev parent reply other threads:[~2020-06-26 14:38 UTC|newest]
Thread overview: 130+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-07 14:11 [PATCH 0/6] fixup ra/rebase-i-more-options Phillip Wood
2020-04-07 14:11 ` [PATCH 1/6] Revert "Revert "Merge branch 'ra/rebase-i-more-options'"" Phillip Wood
2020-04-07 15:16 ` Elijah Newren
2020-04-07 18:01 ` Phillip Wood
2020-04-07 21:04 ` Junio C Hamano
2020-04-07 21:31 ` Junio C Hamano
2020-04-12 17:47 ` Johannes Schindelin
2020-04-13 9:58 ` Phillip Wood
2020-04-13 22:05 ` Junio C Hamano
2020-04-07 14:11 ` [PATCH 2/6] t3433: remove loops from tests Phillip Wood
2020-04-07 14:30 ` Elijah Newren
2020-04-07 14:11 ` [PATCH 3/6] t3433: only compare commit dates Phillip Wood
2020-04-07 14:11 ` [PATCH 4/6] rebase -i: fix --committer-date-is-author-date Phillip Wood
2020-04-07 15:05 ` Elijah Newren
2020-04-07 18:11 ` Phillip Wood
2020-04-07 14:11 ` [PATCH 5/6] Revert "sequencer: allow callers of read_author_script() to ignore fields" Phillip Wood
2020-04-07 15:06 ` Elijah Newren
2020-04-07 14:11 ` [PATCH 6/6] t3433: improve coverage Phillip Wood
2020-04-07 15:13 ` Elijah Newren
2020-04-07 18:16 ` Phillip Wood
2020-04-07 15:17 ` [PATCH 0/6] fixup ra/rebase-i-more-options Elijah Newren
2020-04-07 18:18 ` Phillip Wood
2020-04-07 23:04 ` Junio C Hamano
2020-04-29 10:25 ` [PATCH v2 0/5] cleanup ra/rebase-i-more-options Phillip Wood
2020-04-29 10:25 ` [PATCH v2 1/5] rebase -i: add --ignore-whitespace flag Phillip Wood
2020-05-13 3:54 ` Elijah Newren
2020-05-14 9:47 ` Phillip Wood
2020-04-29 10:25 ` [PATCH v2 2/5] rebase -i: support --committer-date-is-author-date Phillip Wood
2020-05-10 11:14 ` Alban Gruin
2020-05-13 4:08 ` Elijah Newren
2020-04-29 10:25 ` [PATCH v2 3/5] sequencer: rename amend_author to author_to_free Phillip Wood
2020-04-29 10:25 ` [PATCH v2 4/5] rebase -i: support --ignore-date Phillip Wood
2020-05-10 11:14 ` Alban Gruin
2020-05-12 14:47 ` Phillip Wood
2020-05-13 15:33 ` Junio C Hamano
2020-05-13 3:54 ` Elijah Newren
2020-04-29 10:25 ` [PATCH v2 5/5] rebase: add --reset-author-date Phillip Wood
2020-04-29 19:59 ` [PATCH v2 0/5] cleanup ra/rebase-i-more-options Junio C Hamano
2020-05-13 3:57 ` Elijah Newren
2020-05-21 10:14 ` [PATCH v3 " Phillip Wood
2020-05-21 10:14 ` [PATCH v3 1/5] rebase -i: add --ignore-whitespace flag Phillip Wood
2020-05-21 10:14 ` [PATCH v3 2/5] rebase -i: support --committer-date-is-author-date Phillip Wood
2020-05-21 10:14 ` [PATCH v3 3/5] sequencer: rename amend_author to author_to_free Phillip Wood
2020-05-21 10:14 ` [PATCH v3 4/5] rebase -i: support --ignore-date Phillip Wood
2020-05-23 12:30 ` Đoàn Trần Công Danh
2020-05-23 15:43 ` Phillip Wood
2020-05-23 15:52 ` Đoàn Trần Công Danh
2020-05-23 18:50 ` Phillip Wood
2020-05-23 23:05 ` Đoàn Trần Công Danh
2020-05-27 9:55 ` Phillip Wood
2020-05-24 16:32 ` Junio C Hamano
2020-05-21 10:14 ` [PATCH v3 5/5] rebase: add --reset-author-date Phillip Wood
2020-05-22 15:54 ` [PATCH v3 0/5] cleanup ra/rebase-i-more-options Elijah Newren
2020-05-23 8:55 ` Phillip Wood
2020-05-23 6:59 ` Johannes Schindelin
2020-05-27 17:33 ` [PATCH v4 " Phillip Wood
2020-05-27 17:33 ` [PATCH v4 1/5] rebase -i: add --ignore-whitespace flag Phillip Wood
2020-05-29 2:38 ` Johannes Schindelin
2020-06-01 9:23 ` Kerry, Richard
2020-06-01 10:26 ` Phillip Wood
2020-06-01 21:03 ` Johannes Schindelin
2020-05-27 17:33 ` [PATCH v4 2/5] rebase -i: support --committer-date-is-author-date Phillip Wood
2020-05-29 2:52 ` Johannes Schindelin
2020-06-01 10:33 ` Phillip Wood
2020-05-27 17:33 ` [PATCH v4 3/5] sequencer: rename amend_author to author_to_free Phillip Wood
2020-05-27 17:33 ` [PATCH v4 4/5] rebase -i: support --ignore-date Phillip Wood
2020-05-27 17:33 ` [PATCH v4 5/5] rebase: add --reset-author-date Phillip Wood
2020-05-27 17:57 ` [PATCH v4 6/5] fixup! " Phillip Wood
2020-05-28 13:17 ` Đoàn Trần Công Danh
2020-05-29 2:59 ` Johannes Schindelin
2020-06-01 10:36 ` Phillip Wood
2020-05-27 21:10 ` [PATCH v4 0/5] cleanup ra/rebase-i-more-options Junio C Hamano
2020-06-26 9:55 ` [PATCH v5 " Phillip Wood
2020-06-26 9:55 ` [PATCH v5 1/5] rebase -i: add --ignore-whitespace flag Phillip Wood
2020-06-26 13:37 ` Đoàn Trần Công Danh
2020-06-26 14:43 ` Phillip Wood
2020-06-26 16:03 ` Junio C Hamano
2020-06-29 14:14 ` Đoàn Trần Công Danh
2020-07-13 10:02 ` Phillip Wood
2020-06-26 15:43 ` Junio C Hamano
2020-06-26 9:55 ` [PATCH v5 2/5] rebase -i: support --committer-date-is-author-date Phillip Wood
2020-06-26 9:55 ` [PATCH v5 3/5] sequencer: rename amend_author to author_to_free Phillip Wood
2020-06-26 9:55 ` [PATCH v5 4/5] rebase -i: support --ignore-date Phillip Wood
2020-06-26 14:09 ` Đoàn Trần Công Danh
2020-06-26 14:38 ` Phillip Wood [this message]
2020-06-26 16:29 ` Junio C Hamano
2020-06-26 9:55 ` [PATCH v5 5/5] rebase: add --reset-author-date Phillip Wood
2020-06-26 16:35 ` Junio C Hamano
2020-06-26 18:07 ` Phillip Wood
2020-06-26 15:04 ` [PATCH v5 0/5] cleanup ra/rebase-i-more-options Junio C Hamano
2020-07-13 10:10 ` [PATCH v6 0/5] fixup ra/rebase-i-more-options Phillip Wood
2020-07-13 10:10 ` [PATCH v6 1/5] rebase -i: add --ignore-whitespace flag Phillip Wood
2020-07-13 10:10 ` [PATCH v6 2/5] rebase -i: support --committer-date-is-author-date Phillip Wood
2020-07-15 14:27 ` Đoàn Trần Công Danh
2020-07-16 8:23 ` Phillip Wood
2020-07-16 13:06 ` Đoàn Trần Công Danh
2020-07-16 15:17 ` Phillip Wood
2020-07-16 17:34 ` Phillip Wood
2020-07-17 0:25 ` Đoàn Trần Công Danh
2020-07-13 10:10 ` [PATCH v6 3/5] sequencer: rename amend_author to author_to_free Phillip Wood
2020-07-13 10:10 ` [PATCH v6 4/5] rebase -i: support --ignore-date Phillip Wood
2020-07-13 10:10 ` [PATCH v6 5/5] rebase: add --reset-author-date Phillip Wood
2020-07-13 15:28 ` [PATCH v6 0/5] fixup ra/rebase-i-more-options Junio C Hamano
2020-07-15 8:55 ` Phillip Wood
2020-07-16 17:32 ` [PATCH v7 0/5] cleanup ra/rebase-i-more-options Phillip Wood
2020-07-16 17:32 ` [PATCH v7 1/5] rebase -i: add --ignore-whitespace flag Phillip Wood
2020-07-16 17:32 ` [PATCH v7 2/5] rebase -i: support --committer-date-is-author-date Phillip Wood
2020-08-13 13:46 ` Johannes Schindelin
2020-07-16 17:32 ` [PATCH v7 3/5] sequencer: rename amend_author to author_to_free Phillip Wood
2020-07-16 17:32 ` [PATCH v7 4/5] rebase -i: support --ignore-date Phillip Wood
2020-08-13 14:07 ` Johannes Schindelin
2020-07-16 17:32 ` [PATCH v7 5/5] rebase: add --reset-author-date Phillip Wood
2020-07-16 17:39 ` [PATCH v7 0/5] cleanup ra/rebase-i-more-options Junio C Hamano
2020-08-13 14:24 ` Johannes Schindelin
2020-08-13 17:46 ` Junio C Hamano
2020-08-13 19:51 ` Phillip Wood
2020-08-17 17:39 ` [PATCH v8 " Phillip Wood
2020-08-17 17:40 ` [PATCH v8 1/5] rebase -i: add --ignore-whitespace flag Phillip Wood
2020-08-17 17:40 ` [PATCH v8 2/5] am: stop exporting GIT_COMMITTER_DATE Phillip Wood
2020-08-17 19:12 ` Junio C Hamano
2020-08-19 10:20 ` Phillip Wood
2020-08-19 15:51 ` Junio C Hamano
2020-08-20 15:23 ` Phillip Wood
2020-08-17 17:40 ` [PATCH v8 3/5] rebase -i: support --committer-date-is-author-date Phillip Wood
2020-08-26 21:41 ` Junio C Hamano
2020-08-17 17:40 ` [PATCH v8 4/5] rebase -i: support --ignore-date Phillip Wood
2020-08-19 10:22 ` Phillip Wood
2020-08-19 22:20 ` Junio C Hamano
2020-08-20 15:16 ` Phillip Wood
2020-08-17 17:40 ` [PATCH v8 5/5] rebase: add --reset-author-date Phillip Wood
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d0d8dcb2-6714-f0a6-61a3-55c5e0b6ab19@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=alban.gruin@gmail.com \
--cc=congdanhqx@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=rohit.ashiwal265@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).