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 v6 2/5] rebase -i: support --committer-date-is-author-date
Date: Thu, 16 Jul 2020 09:23:17 +0100 [thread overview]
Message-ID: <281d92d3-f901-bca1-6030-fd0c8761f214@gmail.com> (raw)
In-Reply-To: <20200715142717.GA7803@danh.dev>
Hi Danh
On 15/07/2020 15:27, Đoàn Trần Công Danh wrote:
>
> Hi Phillip,
>
> On 2020-07-13 11:10:42+0100, Phillip Wood <phillip.wood123@gmail.com> wrote:
>> [...]
>>
>> + if (opts->committer_date_is_author_date) {
>> + struct ident_split ident;
>> + struct strbuf date = STRBUF_INIT;
>> +
>> + if (split_ident_line(&ident, author, (int)strlen(author)) < 0) {
>> + res = error(_("malformed ident line '%s'"), author);
>
> I've checked with the translation for my native language (vi).
> The translators seem to misread ident (as in identity) as
> indent (as in indentation).
>
> The translation in po/vi.po:25045 (of v2.28.0-rc0) reads:
>
> #~ msgid "malformed ident line"
> #~ msgstr "thụt đầu dòng dị hình"
>
> Translating back to English, it reads: "malformed indentation".
>
> Hence, I think it would read better if we write:
>
> res = error(_("malformed identity line '%s'"), author);
>
> 3 more characters is not that much :)
Looking through the existing strings "invalid ident line: %.*s" is
already used by am so maybe we should reuse that (log.c also contains
"invalid ident line: %s"). Is the translation correct?
#: builtin/am.c:1270
#, c-format
msgid "invalid ident line: %.*s"
msgstr "dòng thụt lề không hợp lệ: %.*s"
Best Wishes
Phillip
>
>> + goto out;
>> + }
>> + if (!ident.date_begin) {
>> + res = error(_("corrupted author without date information"));
>> + goto out;
>> + }
>> +
>> + 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;
>> @@ -2532,6 +2578,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;
>>
>> @@ -2622,6 +2673,8 @@ int write_basic_state(struct replay_opts *opts, const char *head_name,
>> write_file(rebase_path_drop_redundant_commits(), "%s", "");
>> if (opts->keep_redundant_commits)
>> write_file(rebase_path_keep_redundant_commits(), "%s", "");
>> + 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", "");
>>
>> @@ -3542,6 +3595,10 @@ static int do_merge(struct repository *r,
>> goto leave_merge;
>> }
>>
>> + if (opts->committer_date_is_author_date)
>> + argv_array_pushf(&cmd.env_array, "GIT_COMMITTER_DATE=%s",
>> + author_date_from_env_array(&cmd.env_array));
>> +
>> cmd.git_cmd = 1;
>> argv_array_push(&cmd.args, "merge");
>> argv_array_push(&cmd.args, "-s");
>> @@ -3819,7 +3876,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 0bee85093e..4ab94119ae 100644
>> --- a/sequencer.h
>> +++ b/sequencer.h
>> @@ -45,6 +45,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 55ca46786d..c8234062c6 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/t3436-rebase-more-options.sh b/t/t3436-rebase-more-options.sh
>> index 4f8a6e51c9..50a63d8ebe 100755
>> --- a/t/t3436-rebase-more-options.sh
>> +++ b/t/t3436-rebase-more-options.sh
>> @@ -9,6 +9,9 @@ test_description='tests to ensure compatibility between am and interactive backe
>>
>> . "$TEST_DIRECTORY"/lib-rebase.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.
>> @@ -21,11 +24,20 @@ test_expect_success 'setup' '
>> test_write_lines "line 1" "new line 2" "line 3" >file &&
>> 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 &&
>> + rm foo &&
>> test_write_lines "line 1" " line 2" "line 3" >file &&
>> git commit -am "add file" &&
>> - git tag main
>> + git tag main &&
>> +
>> + mkdir test-bin &&
>> + write_script test-bin/git-merge-test <<-\EOF
>> + exec git-merge-recursive "$@"
>> + EOF
>> '
>>
>> test_expect_success '--ignore-whitespace works with apply backend' '
>> @@ -52,6 +64,50 @@ test_expect_success '--ignore-whitespace is remembered when continuing' '
>> git diff --exit-code side
>> '
>>
>> +test_ctime_is_atime () {
>> + git log $1 --format=%ai >authortime &&
>> + git log $1 --format=%ci >committertime &&
>> + test_cmp authortime committertime
>> +}
>> +
>> +test_expect_success '--committer-date-is-author-date works with apply backend' '
>> + GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author &&
>> + git rebase --apply --committer-date-is-author-date HEAD^ &&
>> + test_ctime_is_atime -1
>> +'
>> +
>> +test_expect_success '--committer-date-is-author-date works with merge backend' '
>> + GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author &&
>> + git rebase -m --committer-date-is-author-date HEAD^ &&
>> + test_ctime_is_atime -1
>> +'
>> +
>> +test_expect_success '--committer-date-is-author-date works with rebase -r' '
>> + git checkout side &&
>> + GIT_AUTHOR_DATE="@1234 +0300" git merge --no-ff commit3 &&
>> + git rebase -r --root --committer-date-is-author-date &&
>> + test_ctime_is_atime
>> +'
>> +
>> +test_expect_success '--committer-date-is-author-date works when forking merge' '
>> + git checkout side &&
>> + GIT_AUTHOR_DATE="@1234 +0300" git merge --no-ff commit3 &&
>> + PATH="./test-bin:$PATH" git rebase -r --root --strategy=test \
>> + --committer-date-is-author-date &&
>> + test_ctime_is_atime
>> +'
>> +
>> +test_expect_success '--committer-date-is-author-date works when committing conflict resolution' '
>> + git checkout commit2 &&
>> + GIT_AUTHOR_DATE="@1980 +0000" git commit --amend --only --reset-author &&
>> + test_must_fail git rebase -m --committer-date-is-author-date \
>> + --onto HEAD^^ HEAD^ &&
>> + echo resolved > foo &&
>
> Nitpick: no space after ">" :D
>
next prev parent reply other threads:[~2020-07-16 8:23 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
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 [this message]
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=281d92d3-f901-bca1-6030-fd0c8761f214@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).