From: Phillip Wood <phillip.wood123@gmail.com>
To: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
Cc: Johannes.Schindelin@gmx.de, git@vger.kernel.org,
gitster@pobox.com, martin.agren@gmail.com, newren@gmail.com,
t.gummerer@gmail.com
Subject: Re: [PATCH v4 3/6] rebase -i: support --committer-date-is-author-date
Date: Fri, 4 Oct 2019 10:37:43 +0100 [thread overview]
Message-ID: <3f29cb5d-dbc2-ae00-651b-22e9f437372a@gmail.com> (raw)
In-Reply-To: <20190907115034.14933-4-rohit.ashiwal265@gmail.com>
Hi Rohit
The handling of ident_split is looking better now but I've got a
question below about returning vs going to a cleanup section when
there's an error.
On 07/09/2019 12:50, Rohit Ashiwal wrote:
> rebase am already has this flag to "lie" about the committer date
> by changing it to the author date. Let's add the same for
> interactive machinery.
>
> Signed-off-by: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
> ---
> Documentation/git-rebase.txt | 10 ++--
> builtin/rebase.c | 17 +++++--
> sequencer.c | 61 ++++++++++++++++++++++++-
> sequencer.h | 1 +
> t/t3422-rebase-incompatible-options.sh | 1 -
> t/t3433-rebase-options-compatibility.sh | 37 +++++++++++++++
> 6 files changed, 116 insertions(+), 11 deletions(-)
>
> diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
> index 873eb5768c..e7c0eac18c 100644
> --- a/Documentation/git-rebase.txt
> +++ b/Documentation/git-rebase.txt
> @@ -386,9 +386,13 @@ unchanged for the sake of a three-way merge.
> See also INCOMPATIBLE OPTIONS below.
>
> --committer-date-is-author-date::
> + Instead of recording the time the rebased commits are
> + created as the committer date, reuse the author date
> + as the committer date. This implies --force-rebase.
> +
> --ignore-date::
> - These flags are passed to 'git am' to easily change the dates
> - of the rebased commits (see linkgit:git-am[1]).
> + This flag is passed to 'git am' to change the author date
> + of each rebased commit (see linkgit:git-am[1]).
> +
> See also INCOMPATIBLE OPTIONS below.
>
> @@ -525,7 +529,6 @@ INCOMPATIBLE OPTIONS
>
> The following options:
>
> - * --committer-date-is-author-date
> * --ignore-date
> * --whitespace
> * -C
> @@ -551,6 +554,7 @@ In addition, the following pairs of options are incompatible:
> * --preserve-merges and --signoff
> * --preserve-merges and --rebase-merges
> * --preserve-merges and --ignore-whitespace
> + * --preserve-merges and --committer-date-is-author-date
> * --rebase-merges and --ignore-whitespace
> * --rebase-merges and --strategy
> * --rebase-merges and --strategy-option
> diff --git a/builtin/rebase.c b/builtin/rebase.c
> index f8a618d54c..656bc7d7e9 100644
> --- a/builtin/rebase.c
> +++ b/builtin/rebase.c
> @@ -82,6 +82,7 @@ struct rebase_options {
> int ignore_whitespace;
> char *gpg_sign_opt;
> int autostash;
> + int committer_date_is_author_date;
> char *cmd;
> int allow_empty_message;
> int rebase_merges, rebase_cousins;
> @@ -114,6 +115,8 @@ static struct replay_opts get_replay_opts(const struct rebase_options *opts)
> replay.allow_empty_message = opts->allow_empty_message;
> replay.verbose = opts->flags & REBASE_VERBOSE;
> replay.reschedule_failed_exec = opts->reschedule_failed_exec;
> + replay.committer_date_is_author_date =
> + opts->committer_date_is_author_date;
> replay.gpg_sign = xstrdup_or_null(opts->gpg_sign_opt);
> replay.strategy = opts->strategy;
>
> @@ -976,6 +979,8 @@ static int run_am(struct rebase_options *opts)
>
> if (opts->ignore_whitespace)
> argv_array_push(&am.args, "--ignore-whitespace");
> + if (opts->committer_date_is_author_date)
> + argv_array_push(&opts->git_am_opts, "--committer-date-is-author-date");
> if (opts->action && !strcmp("continue", opts->action)) {
> argv_array_push(&am.args, "--resolved");
> argv_array_pushf(&am.args, "--resolvemsg=%s", resolvemsg);
> @@ -1419,9 +1424,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
> PARSE_OPT_NOARG, NULL, REBASE_DIFFSTAT },
> OPT_BOOL(0, "signoff", &options.signoff,
> N_("add a Signed-off-by: line to each commit")),
> - OPT_PASSTHRU_ARGV(0, "committer-date-is-author-date",
> - &options.git_am_opts, NULL,
> - N_("passed to 'git am'"), PARSE_OPT_NOARG),
> + 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_PASSTHRU_ARGV('C', NULL, &options.git_am_opts, N_("n"),
> @@ -1692,10 +1697,12 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
> state_dir_base, cmd_live_rebase, buf.buf);
> }
>
> + if (options.committer_date_is_author_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, "--committer-date-is-author-date") ||
> - !strcmp(option, "--ignore-date") ||
> + if (!strcmp(option, "--ignore-date") ||
> !strcmp(option, "--whitespace=fix") ||
> !strcmp(option, "--whitespace=strip"))
> options.flags |= REBASE_FORCE;
> diff --git a/sequencer.c b/sequencer.c
> index adeff2561e..fd925f2d72 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -147,6 +147,7 @@ static GIT_PATH_FUNC(rebase_path_refs_to_delete, "rebase-merge/refs-to-delete")
> * command-line.
> */
> 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_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")
> @@ -879,6 +880,17 @@ static char *get_author(const char *message)
> return NULL;
> }
>
> +/* Returns a "date" string that needs to be free()'d by the caller */
> +static char *read_author_date_or_null(void)
> +{
> + char *date;
> +
> + if (read_author_script(rebase_path_author_script(),
> + NULL, NULL, &date, 0))
> + return NULL;
> + return date;
> +}
> +
> 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"
> @@ -938,6 +950,24 @@ static int run_git_commit(struct repository *r,
>
> cmd.git_cmd = 1;
>
> + if (opts->committer_date_is_author_date) {
> + int res = -1;
> + struct strbuf datebuf = STRBUF_INIT;
> + char *date = read_author_date_or_null();
> +
> + if (!date)
> + return -1;
> +
> + strbuf_addf(&datebuf, "@%s", date);
> + res = setenv("GIT_COMMITTER_DATE", datebuf.buf, 1);
> +
> + strbuf_release(&datebuf);
> + free(date);
> +
> + if (res)
> + return -1;
> + }
> +
> if (is_rebase_i(opts) && read_env_script(&cmd.env_array)) {
> const char *gpg_opt = gpg_sign_opt_quoted(opts);
>
> @@ -1331,7 +1361,6 @@ static int try_to_commit(struct repository *r,
>
> if (parse_head(r, ¤t_head))
> return -1;
> -
> if (flags & AMEND_MSG) {
> const char *exclude_gpgsig[] = { "gpgsig", NULL };
> const char *out_enc = get_commit_output_encoding();
> @@ -1359,6 +1388,26 @@ static int try_to_commit(struct repository *r,
> commit_list_insert(current_head, &parents);
> }
>
> + if (opts->committer_date_is_author_date) {
> + int len = strlen(author);
> + struct ident_split ident;
> + struct strbuf date = STRBUF_INIT;
> +
> + if (split_ident_line(&ident, author, len) < 0)
> + return error(_("malformed ident line"));
Here (and just below) we return if there is an error but later on we
`goto out` should we be doing that here to clean something up?
Best Wishes
Phillip
> + if (!ident.date_begin)
> + return error(_("corrupted author without date information"));
> +
> + strbuf_addf(&date, "@%.*s %.*s",
> + (int)(ident.date_end - ident.date_begin), ident.date_begin,
> + (int)(ident.tz_end - ident.tz_begin), ident.tz_begin);
> + res = setenv("GIT_COMMITTER_DATE", date.buf, 1);
> + strbuf_release(&date);
> +
> + if (res)
> + goto out;
> + }
> +
> if (write_index_as_tree(&tree, r->index, r->index_file, 0, NULL)) {
> res = error(_("git write-tree failed to write a tree"));
> goto out;
> @@ -2473,6 +2522,11 @@ static int read_populate_opts(struct replay_opts *opts)
> opts->signoff = 1;
> }
>
> + if (file_exists(rebase_path_cdate_is_adate())) {
> + opts->allow_ff = 0;
> + opts->committer_date_is_author_date = 1;
> + }
> +
> if (file_exists(rebase_path_reschedule_failed_exec()))
> opts->reschedule_failed_exec = 1;
>
> @@ -2555,6 +2609,8 @@ int write_basic_state(struct replay_opts *opts, const char *head_name,
> write_file(rebase_path_gpg_sign_opt(), "-S%s\n", opts->gpg_sign);
> if (opts->signoff)
> write_file(rebase_path_signoff(), "--signoff\n");
> + if (opts->committer_date_is_author_date)
> + write_file(rebase_path_cdate_is_adate(), "%s", "");
> if (opts->reschedule_failed_exec)
> write_file(rebase_path_reschedule_failed_exec(), "%s", "");
>
> @@ -3752,7 +3808,8 @@ static int pick_commits(struct repository *r,
> setenv(GIT_REFLOG_ACTION, action_name(opts), 0);
> if (opts->allow_ff)
> assert(!(opts->signoff || opts->no_commit ||
> - opts->record_origin || opts->edit));
> + opts->record_origin || opts->edit ||
> + opts->committer_date_is_author_date));
> if (read_and_refresh_cache(r, opts))
> return -1;
>
> diff --git a/sequencer.h b/sequencer.h
> index 6704acbb9c..e3881e9275 100644
> --- a/sequencer.h
> +++ b/sequencer.h
> @@ -43,6 +43,7 @@ struct replay_opts {
> int verbose;
> int quiet;
> int reschedule_failed_exec;
> + int committer_date_is_author_date;
>
> int mainline;
>
> diff --git a/t/t3422-rebase-incompatible-options.sh b/t/t3422-rebase-incompatible-options.sh
> index 4342f79eea..7402f7e3da 100755
> --- a/t/t3422-rebase-incompatible-options.sh
> +++ b/t/t3422-rebase-incompatible-options.sh
> @@ -61,7 +61,6 @@ test_rebase_am_only () {
> }
>
> test_rebase_am_only --whitespace=fix
> -test_rebase_am_only --committer-date-is-author-date
> test_rebase_am_only -C4
>
> test_expect_success REBASE_P '--preserve-merges incompatible with --signoff' '
> diff --git a/t/t3433-rebase-options-compatibility.sh b/t/t3433-rebase-options-compatibility.sh
> index 2e16e00a9d..6c1fbab4d8 100755
> --- a/t/t3433-rebase-options-compatibility.sh
> +++ b/t/t3433-rebase-options-compatibility.sh
> @@ -7,6 +7,9 @@ test_description='tests to ensure compatibility between am and interactive backe
>
> . ./test-lib.sh
>
> +GIT_AUTHOR_DATE="1999-04-02T08:03:20+05:30"
> +export GIT_AUTHOR_DATE
> +
> # This is a special case in which both am and interactive backends
> # provide the same output. It was done intentionally because
> # both the backends fall short of optimal behaviour.
> @@ -26,8 +29,13 @@ test_expect_success 'setup' '
> EOF
> git commit -am "update file" &&
> git tag side &&
> + test_commit commit1 foo foo1 &&
> + test_commit commit2 foo foo2 &&
> + test_commit commit3 foo foo3 &&
>
> git checkout --orphan master &&
> + git rm --cached foo &&
> + rm foo &&
> sed -e "s/^|//" >file <<-\EOF &&
> |line 1
> | line 2
> @@ -62,4 +70,33 @@ test_expect_success '--ignore-whitespace works with interactive backend' '
> test_cmp expect file
> '
>
> +test_expect_success '--committer-date-is-author-date works with am backend' '
> + git commit --amend &&
> + git rebase --committer-date-is-author-date HEAD^ &&
> + git show HEAD --pretty="format:%ai" >authortime &&
> + git show HEAD --pretty="format:%ci" >committertime &&
> + test_cmp authortime committertime
> +'
> +
> +test_expect_success '--committer-date-is-author-date works with interactive backend' '
> + git commit --amend &&
> + git rebase -i --committer-date-is-author-date HEAD^ &&
> + git show HEAD --pretty="format:%ai" >authortime &&
> + git show HEAD --pretty="format:%ci" >committertime &&
> + test_cmp authortime committertime
> +'
> +
> +test_expect_success '--committer-date-is-author-date works with rebase -r' '
> + git checkout side &&
> + git merge commit3 &&
> + git rebase -r --root --committer-date-is-author-date &&
> + git rev-list HEAD >rev_list &&
> + while read HASH
> + do
> + git show $HASH --pretty="format:%ai" >authortime
> + git show $HASH --pretty="format:%ci" >committertime
> + test_cmp authortime committertime
> + done <rev_list
> +'
> +
> test_done
>
next prev parent reply other threads:[~2019-10-04 9:37 UTC|newest]
Thread overview: 96+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-06 17:36 [GSoC][PATCHl 0/6] rebase -i: support more options Rohit Ashiwal
2019-08-06 17:36 ` [GSoC][PATCHl 1/6] rebase -i: add --ignore-whitespace flag Rohit Ashiwal
2019-08-07 5:38 ` Junio C Hamano
2019-08-07 20:25 ` Rohit Ashiwal
2019-08-08 16:44 ` Phillip Wood
2019-08-12 17:43 ` Rohit Ashiwal
2019-08-06 17:36 ` [GSoC][PATCHl 2/6] sequencer: add NULL checks under read_author_script Rohit Ashiwal
2019-08-06 17:36 ` [GSoC][PATCHl 3/6] rebase -i: support --committer-date-is-author-date Rohit Ashiwal
2019-08-08 11:29 ` Phillip Wood
2019-08-08 16:00 ` Junio C Hamano
2019-08-06 17:36 ` [GSoC][PATCHl 4/6] sequencer: rename amend_author to author_to_rename Rohit Ashiwal
2019-08-08 11:30 ` Phillip Wood
2019-08-06 17:36 ` [GSoC][PATCHl 5/6] rebase -i: support --ignore-date Rohit Ashiwal
2019-08-07 19:41 ` Johannes Schindelin
2019-08-07 20:22 ` Junio C Hamano
2019-08-07 20:33 ` Rohit Ashiwal
2019-08-08 11:42 ` Phillip Wood
2019-08-08 16:53 ` Phillip Wood
2019-08-06 17:36 ` [GSoC][PATCHl 6/6] rebase: add --author-date-is-committer-date Rohit Ashiwal
2019-08-08 11:42 ` Phillip Wood
2019-08-12 19:42 ` [GSoC][PATCH v2 0/6] rebase -i: support more options Rohit Ashiwal
2019-08-12 19:42 ` [GSoC][PATCH v2 1/6] rebase -i: add --ignore-whitespace flag Rohit Ashiwal
2019-08-13 12:07 ` Phillip Wood
2019-08-12 19:42 ` [GSoC][PATCH v2 2/6] sequencer: add NULL checks under read_author_script Rohit Ashiwal
2019-08-12 19:42 ` [GSoC][PATCH v2 3/6] rebase -i: support --committer-date-is-author-date Rohit Ashiwal
2019-08-13 10:38 ` Phillip Wood
2019-08-13 12:09 ` Phillip Wood
2019-08-13 17:06 ` Junio C Hamano
2019-08-14 18:38 ` Phillip Wood
2019-08-13 13:35 ` Phillip Wood
2019-08-12 19:42 ` [GSoC][PATCH v2 4/6] sequencer: rename amend_author to author_to_rename Rohit Ashiwal
2019-08-13 13:29 ` Phillip Wood
2019-08-12 19:42 ` [GSoC][PATCH v2 5/6] rebase -i: support --ignore-date Rohit Ashiwal
2019-08-13 13:28 ` Phillip Wood
2019-08-13 17:21 ` Junio C Hamano
2019-08-14 18:47 ` Phillip Wood
2019-08-13 21:45 ` Junio C Hamano
2019-08-14 18:51 ` Phillip Wood
2019-08-14 19:33 ` Junio C Hamano
2019-08-17 9:28 ` Phillip Wood
2019-08-12 19:43 ` [GSoC][PATCH v2 6/6] rebase: add --author-date-is-committer-date Rohit Ashiwal
2019-08-13 17:28 ` Junio C Hamano
2019-08-20 3:45 ` [PATCH v3 0/6] rebase -i: support more options Rohit Ashiwal
2019-08-20 3:45 ` [PATCH v3 1/6] rebase -i: add --ignore-whitespace flag Rohit Ashiwal
2019-08-20 18:40 ` Phillip Wood
2019-08-20 18:47 ` Rohit Ashiwal
2019-08-20 3:45 ` [PATCH v3 2/6] sequencer: add NULL checks under read_author_script Rohit Ashiwal
2019-08-23 15:20 ` Junio C Hamano
2019-08-20 3:45 ` [PATCH v3 3/6] rebase -i: support --committer-date-is-author-date Rohit Ashiwal
2019-08-20 13:32 ` Phillip Wood
2019-08-20 3:45 ` [PATCH v3 4/6] sequencer: rename amend_author to author_to_rename Rohit Ashiwal
2019-08-20 3:45 ` [PATCH v3 5/6] rebase -i: support --ignore-date Rohit Ashiwal
2019-08-20 13:45 ` Phillip Wood
2019-08-20 17:42 ` Junio C Hamano
2019-08-20 18:30 ` Phillip Wood
2019-08-20 3:45 ` [GSoC][PATCH v2 6/6] rebase: add --author-date-is-committer-date Rohit Ashiwal
2019-08-20 4:00 ` Rohit Ashiwal
2019-08-20 3:45 ` [PATCH v3 6/6] rebase: add --reset-author-date Rohit Ashiwal
2019-08-20 3:54 ` [PATCH v3 0/6] rebase -i: support more options Rohit Ashiwal
2019-08-20 13:56 ` Phillip Wood
2019-08-20 17:53 ` Junio C Hamano
2019-08-20 18:37 ` Phillip Wood
2019-09-07 11:50 ` [PATCH v4 " Rohit Ashiwal
2019-09-07 11:50 ` [PATCH v4 1/6] rebase -i: add --ignore-whitespace flag Rohit Ashiwal
2019-10-04 9:29 ` Phillip Wood
2019-10-05 18:12 ` Elijah Newren
2019-10-06 17:57 ` Rohit Ashiwal
2019-09-07 11:50 ` [PATCH v4 2/6] sequencer: allow callers of read_author_script() to ignore fields Rohit Ashiwal
2019-09-07 11:50 ` [PATCH v4 3/6] rebase -i: support --committer-date-is-author-date Rohit Ashiwal
2019-10-04 9:37 ` Phillip Wood [this message]
2019-10-06 17:57 ` Rohit Ashiwal
2019-10-24 13:28 ` Phillip Wood
2019-09-07 11:50 ` [PATCH v4 4/6] sequencer: rename amend_author to author_to_rename Rohit Ashiwal
2019-09-07 11:50 ` [PATCH v4 5/6] rebase -i: support --ignore-date Rohit Ashiwal
2019-09-07 20:56 ` Rohit Ashiwal
2019-09-27 10:00 ` Phillip Wood
2019-10-06 17:57 ` Rohit Ashiwal
2019-10-24 20:36 ` Phillip Wood
2019-09-07 11:50 ` [PATCH v4 6/6] rebase: add --reset-author-date Rohit Ashiwal
2019-09-09 18:02 ` [PATCH v4 0/6] rebase -i: support more options Junio C Hamano
2019-09-09 18:51 ` Phillip Wood
2019-09-09 19:24 ` Junio C Hamano
2019-11-01 13:59 ` [PATCH v5 " Rohit Ashiwal
2019-11-01 13:59 ` [PATCH v5 1/6] rebase -i: add --ignore-whitespace flag Rohit Ashiwal
2019-11-01 13:59 ` [PATCH v5 2/6] sequencer: allow callers of read_author_script() to ignore fields Rohit Ashiwal
2019-11-01 14:00 ` [PATCH v5 3/6] rebase -i: support --committer-date-is-author-date Rohit Ashiwal
2019-11-01 14:00 ` [PATCH v5 4/6] sequencer: rename amend_author to author_to_rename Rohit Ashiwal
2019-11-01 14:00 ` [PATCH v5 5/6] rebase -i: support --ignore-date Rohit Ashiwal
2019-11-02 7:32 ` Junio C Hamano
2019-11-02 7:48 ` Junio C Hamano
2019-11-01 14:00 ` [PATCH v5 6/6] rebase: add --reset-author-date Rohit Ashiwal
2019-11-02 7:34 ` Junio C Hamano
2019-11-21 6:14 ` [PATCH v5 0/6] rebase -i: support more options Junio C Hamano
2019-11-21 8:17 ` Alban Gruin
2019-11-22 6:32 ` Junio C Hamano
2019-11-28 11:14 ` 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=3f29cb5d-dbc2-ae00-651b-22e9f437372a@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=martin.agren@gmail.com \
--cc=newren@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=rohit.ashiwal265@gmail.com \
--cc=t.gummerer@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).