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 v3 0/6] rebase -i: support more options
Date: Tue, 20 Aug 2019 14:56:06 +0100 [thread overview]
Message-ID: <71c313d7-e08d-f62f-c52e-aabca0d97002@gmail.com> (raw)
In-Reply-To: <20190820034536.13071-1-rohit.ashiwal265@gmail.com>
Hi Rohit
On 20/08/2019 04:45, Rohit Ashiwal wrote:
> I've tries to incorporated all the suggestions.
It is helpful if you can list the changes to remind us all what we said.
(as a patch author I find composing that is helpful to remind me if
there's anything I've forgotten to address)
Also there are a couple of things that were discussed such as splitting
up the author and passing it round as a <name, email, date, tz> tuple
and testing a non-default timezone which aren't included - that's fine
but it helps if you take a moment to explain why in the cover letter.
>
> Some points:
> - According to v2.0.0's git-am.sh, ignore-date should override
> committer-date-is-author-date. Ergo, we are not barfing out
> when both flags are provided.
> - Should the 'const' qualifier be removed[2]? Since it is leaving
> a false impression that author should not be free()'d.
The author returned by read_author_ident() is owned by the strbuf that
you pass to read_author_ident() which is confusing.
Best Wishes
Phillip
>
> [1]: git show v2.0.0:git-am.sh
> [2]: https://github.com/git/git/blob/v2.23.0/sequencer.c#L959
>
> Rohit Ashiwal (6):
> rebase -i: add --ignore-whitespace flag
> sequencer: add NULL checks under read_author_script
> rebase -i: support --committer-date-is-author-date
> sequencer: rename amend_author to author_to_rename
> rebase -i: support --ignore-date
> rebase: add --reset-author-date
>
> Documentation/git-rebase.txt | 26 +++--
> builtin/rebase.c | 53 +++++++---
> sequencer.c | 135 ++++++++++++++++++++++--
> sequencer.h | 2 +
> t/t3422-rebase-incompatible-options.sh | 2 -
> t/t3433-rebase-options-compatibility.sh | 100 ++++++++++++++++++
> 6 files changed, 289 insertions(+), 29 deletions(-)
> create mode 100755 t/t3433-rebase-options-compatibility.sh
>
> Range-diff:
> 1: 4cd0aa3084 ! 1: e82ed8cad5 rebase -i: add --ignore-whitespace flag
> @@ -19,10 +19,13 @@
> default is `--no-fork-point`, otherwise the default is `--fork-point`.
>
> --ignore-whitespace::
> -+ This flag is either passed to the 'git apply' program
> -+ (see linkgit:git-apply[1]), or to 'git merge' program
> -+ (see linkgit:git-merge[1]) as `-Xignore-space-change`,
> -+ depending on which backend is selected by other options.
> ++ Behaves differently depending on which backend is selected.
> +++
> ++'am' backend: When applying a patch, ignore changes in whitespace in
> ++context lines if necessary.
> +++
> ++'interactive' backend: Treat lines with only whitespace changes as
> ++unchanged for the sake of a three-way merge.
> +
> --whitespace=<option>::
> - These flag are passed to the 'git apply' program
> @@ -63,7 +66,7 @@
>
> static struct replay_opts get_replay_opts(const struct rebase_options *opts)
> {
> -+ char *strategy_opts = opts->strategy_opts;
> ++ struct strbuf strategy_buf = STRBUF_INIT;
> struct replay_opts replay = REPLAY_OPTS_INIT;
>
> replay.action = REPLAY_INTERACTIVE_REBASE;
> @@ -71,24 +74,19 @@
> replay.reschedule_failed_exec = opts->reschedule_failed_exec;
> replay.gpg_sign = xstrdup_or_null(opts->gpg_sign_opt);
> replay.strategy = opts->strategy;
> -- if (opts->strategy_opts)
> -- parse_strategy_opts(&replay, opts->strategy_opts);
> -+
> -+ if (opts->ignore_whitespace) {
> -+ struct strbuf buf = STRBUF_INIT;
> -+
> -+ if (strategy_opts)
> -+ strbuf_addstr(&buf, strategy_opts);
> +
> -+ strbuf_addstr(&buf, " --ignore-space-change");
> -+ free(strategy_opts);
> -+ strategy_opts = strbuf_detach(&buf, NULL);
> -+ }
> -+ if (strategy_opts)
> -+ parse_strategy_opts(&replay, strategy_opts);
> + if (opts->strategy_opts)
> +- parse_strategy_opts(&replay, opts->strategy_opts);
> ++ strbuf_addstr(&strategy_buf, opts->strategy_opts);
> ++ if (opts->ignore_whitespace)
> ++ strbuf_addstr(&strategy_buf, " --ignore-space-change");
> ++ if (strategy_buf.len)
> ++ parse_strategy_opts(&replay, strategy_buf.buf);
>
> ++ strbuf_release(&strategy_buf);
> return replay;
> }
> +
> @@
> argc = parse_options(argc, argv, prefix, options,
> builtin_rebase_interactive_usage, PARSE_OPT_KEEP_ARGV0);
> 2: e2c0304587 = 2: 209057b361 sequencer: add NULL checks under read_author_script
> 3: 6aed57ae2e ! 3: a4e6644ef8 rebase -i: support --committer-date-is-author-date
> @@ -21,10 +21,12 @@
> +
> --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 the rebased commits (see linkgit:git-am[1]).
> ++ of each rebased commit (see linkgit:git-am[1]).
> +
> See also INCOMPATIBLE OPTIONS below.
> +
> @@
>
> The following options:
> @@ -62,16 +64,6 @@
> replay.gpg_sign = xstrdup_or_null(opts->gpg_sign_opt);
> replay.strategy = opts->strategy;
>
> -@@
> - warning(_("--[no-]rebase-cousins has no effect without "
> - "--rebase-merges"));
> -
> -+ if (opts.committer_date_is_author_date)
> -+ opts.flags |= REBASE_FORCE;
> -+
> - return !!run_rebase_interactive(&opts, command);
> - }
> -
> @@
>
> if (opts->ignore_whitespace)
> @@ -149,14 +141,14 @@
> + struct strbuf datebuf = STRBUF_INIT;
> + char *date = read_author_date_or_null();
> +
> ++ if (!date)
> ++ return -1;
> ++
> + strbuf_addf(&datebuf, "@%s", date);
> + free(date);
> +
> + date = strbuf_detach(&datebuf, &len);
> -+
> -+ if (len > 1)
> -+ res = setenv("GIT_COMMITTER_DATE", date, 1);
> -+
> ++ res = setenv("GIT_COMMITTER_DATE", date, 1);
> + free(date);
> +
> + if (res)
> @@ -187,7 +179,7 @@
> + if (!ident.date_begin)
> + return error(_("corrupted author without date information"));
> +
> -+ strbuf_addf(&date, "@%s",ident.date_begin);
> ++ strbuf_addf(&date, "@%s", ident.date_begin);
> + setenv("GIT_COMMITTER_DATE", date.buf, 1);
> + strbuf_release(&date);
> + }
> 4: 36a0c017c2 = 4: 6ac1885c54 sequencer: rename amend_author to author_to_rename
> 5: 3a4ffeb995 ! 5: a69749dd67 rebase -i: support --ignore-date
> @@ -16,9 +16,9 @@
>
> --ignore-date::
> - This flag is passed to 'git am' to change the author date
> -- of the rebased commits (see linkgit:git-am[1]).
> -+ Instead of using the given author date, re-set it to the value
> -+ same as committer (current) date. This implies --force-rebase.
> +- of each rebased commit (see linkgit:git-am[1]).
> ++ Instead of using the given author date, reset it to the value
> ++ same as the current time. This implies --force-rebase.
> +
> See also INCOMPATIBLE OPTIONS below.
>
> @@ -58,18 +58,6 @@
> replay.gpg_sign = xstrdup_or_null(opts->gpg_sign_opt);
> replay.strategy = opts->strategy;
>
> -@@
> - warning(_("--[no-]rebase-cousins has no effect without "
> - "--rebase-merges"));
> -
> -- if (opts.committer_date_is_author_date)
> -+ if (opts.ignore_date)
> -+ opts.committer_date_is_author_date = 0;
> -+ if (opts.committer_date_is_author_date ||
> -+ opts.ignore_date)
> - opts.flags |= REBASE_FORCE;
> -
> - return !!run_rebase_interactive(&opts, command);
> @@
> argv_array_push(&am.args, "--ignore-whitespace");
> if (opts->committer_date_is_author_date)
> @@ -125,18 +113,19 @@
> return buf->buf;
> }
>
> -+static void ignore_author_date(const char **author)
> ++/* 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);
> ++ int len = strlen(author);
> + struct ident_split ident;
> + struct strbuf new_author = STRBUF_INIT;
> +
> -+ split_ident_line(&ident, *author, len);
> ++ split_ident_line(&ident, author, len);
> + len = ident.mail_end - ident.name_begin + 1;
> +
> -+ strbuf_addf(&new_author, "%.*s", len, *author);
> ++ strbuf_addf(&new_author, "%.*s ", len, author);
> + datestamp(&new_author);
> -+ *author = strbuf_detach(&new_author, NULL);
> ++ return strbuf_detach(&new_author, NULL);
> +}
> +
> +static void push_dates(struct child_process *child)
> @@ -160,11 +149,13 @@
> - 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");
> -+ ignore_author_date(&author);
> ++ free((void *)author);
> ++ author = new_author;
> + }
> res = commit_tree(msg.buf, msg.len, cache_tree_oid,
> NULL, &root_commit, author,
> @@ -187,7 +178,7 @@
> reset_ident_date();
>
> + if (opts->ignore_date) {
> -+ ignore_author_date(&author);
> ++ author = ignore_author_date(author);
> + free(author_to_free);
> + author_to_free = (char *)author;
> + }
> 6: cb81e6c4e5 ! 6: 210d15cca0 rebase: add --author-date-is-committer-date
> @@ -1,6 +1,6 @@
> Author: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
>
> - rebase: add --author-date-is-committer-date
> + rebase: add --reset-author-date
>
> The previous commit introduced --ignore-date flag to interactive
> rebase, but the name is actually very vague in context of rebase -i
> @@ -16,9 +16,9 @@
> as the committer date. This implies --force-rebase.
>
> --ignore-date::
> -+--author-date-is-committer-date::
> - Instead of using the given author date, re-set it to the value
> - same as committer (current) date. This implies --force-rebase.
> ++--reset-author-date::
> + Instead of using the given author date, reset it to the value
> + same as the current time. This implies --force-rebase.
> +
>
> diff --git a/builtin/rebase.c b/builtin/rebase.c
> @@ -28,7 +28,7 @@
> OPT_BOOL(0, "committer-date-is-author-date",
> &options.committer_date_is_author_date,
> N_("make committer date match author date")),
> -+ OPT_BOOL(0, "author-date-is-committer-date", &options.ignore_date,
> ++ OPT_BOOL(0, "reset-author-date", &options.ignore_date,
> + "ignore author date and use current date"),
> OPT_BOOL(0, "ignore-date", &options.ignore_date,
> "ignore author date and use current date"),
>
next prev parent reply other threads:[~2019-08-20 13:56 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 [this message]
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
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=71c313d7-e08d-f62f-c52e-aabca0d97002@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).