From: Phillip Wood <phillip.wood123@gmail.com>
To: "Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"Junio C Hamano" <gitster@pobox.com>,
"Elijah Newren" <newren@gmail.com>,
"Rohit Ashiwal" <rohit.ashiwal265@gmail.com>,
"Đoàn Trần Công Danh" <congdanhqx@gmail.com>,
"Alban Gruin" <alban.gruin@gmail.com>,
"Git Mailing List" <git@vger.kernel.org>
Subject: [PATCH v5 5/5] rebase: add --reset-author-date
Date: Fri, 26 Jun 2020 10:55:28 +0100 [thread overview]
Message-ID: <20200626095528.117524-6-phillip.wood123@gmail.com> (raw)
In-Reply-To: <20200626095528.117524-1-phillip.wood123@gmail.com>
From: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
The previous commit introduced --ignore-date flag to rebase -i, but the
name is rather vague as it does not say whether the author date or the
committer date is ignored. Add an alias to convey the precise purpose.
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
---
Documentation/git-rebase.txt | 1 +
builtin/rebase.c | 6 ++++--
t/t3436-rebase-more-options.sh | 34 +++++++++++++++++++++-------------
3 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index e2717e20e6..a5f82913fb 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -450,6 +450,7 @@ See also INCOMPATIBLE OPTIONS below.
date. This option implies --force-rebase.
--ignore-date::
+--reset-author-date::
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`.
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 890dd4c588..3fe33beef4 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1505,8 +1505,10 @@ 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_BOOL(0, "ignore-date", &options.ignore_date,
- "ignore author date and use current date"),
+ OPT_BOOL(0, "reset-author-date", &options.ignore_date,
+ N_("ignore author date and use current date")),
+ OPT_HIDDEN_BOOL(0, "ignore-date", &options.ignore_date,
+ N_("synonym of --reset-author-date")),
OPT_PASSTHRU_ARGV('C', NULL, &options.git_am_opts, N_("n"),
N_("passed to 'git apply'"), 0),
OPT_BOOL(0, "ignore-whitespace", &ignore_whitespace,
diff --git a/t/t3436-rebase-more-options.sh b/t/t3436-rebase-more-options.sh
index 0ede2b8900..5b8963272a 100755
--- a/t/t3436-rebase-more-options.sh
+++ b/t/t3436-rebase-more-options.sh
@@ -117,53 +117,61 @@ test_ctime_is_ignored () {
! grep -v +0000 authortime
}
-test_expect_success '--ignore-date works with apply backend' '
+test_expect_success '--reset-author-date works with apply backend' '
git commit --amend --date="$GIT_AUTHOR_DATE" &&
- git rebase --apply --ignore-date HEAD^ &&
+ git rebase --apply --reset-author-date HEAD^ &&
test_ctime_is_ignored -1
'
-test_expect_success '--ignore-date works with merge backend' '
+test_expect_success '--reset-author-date works with merge backend' '
git commit --amend --date="$GIT_AUTHOR_DATE" &&
- git rebase --ignore-date -m HEAD^ &&
+ git rebase --reset-author-date -m HEAD^ &&
test_ctime_is_ignored -1
'
-test_expect_success '--ignore-date works after conflict resolution' '
- test_must_fail git rebase --ignore-date -m \
+test_expect_success '--reset-author-date works after conflict resolution' '
+ test_must_fail git rebase --reset-author-date -m \
--onto commit2^^ commit2^ commit2 &&
echo resolved >foo &&
git add foo &&
git rebase --continue &&
test_ctime_is_ignored -1
'
-test_expect_success '--ignore-date works with rebase -r' '
+test_expect_success '--reset-author-date works with rebase -r' '
git checkout side &&
git merge --no-ff commit3 &&
- git rebase -r --root --ignore-date &&
+ git rebase -r --root --reset-author-date &&
test_ctime_is_ignored
'
-test_expect_success '--ignore-date with --committer-date-is-author-date works' '
+test_expect_success '--reset-author-date with --committer-date-is-author-date works' '
test_must_fail git rebase -m --committer-date-is-author-date \
- --ignore-date --onto commit2^^ commit2^ commit3 &&
+ --reset-author-date --onto commit2^^ commit2^ commit3 &&
git checkout --theirs foo &&
git add foo &&
git rebase --continue &&
test_ctime_is_atime -2 &&
test_ctime_is_ignored -2
'
-test_expect_success '--ignore-date --committer-date-is-author-date works when forking merge' '
+test_expect_success '--reset-author-date --committer-date-is-author-date works when forking merge' '
GIT_SEQUENCE_EDITOR="echo \"merge -C $(git rev-parse HEAD) commit3\">" \
PATH="./test-bin:$PATH" git rebase -i --strategy=test \
- --ignore-date --committer-date-is-author-date \
- side side &&
+ --reset-author-date \
+ --committer-date-is-author-date side side &&
test_ctime_is_atime -1 &&
test_ctime_is_ignored -1
'
+test_expect_success '--ignore-date is an alias for --reset-author-date' '
+ git commit --amend --date="$GIT_AUTHOR_DATE" &&
+ git rebase --apply --ignore-date HEAD^ &&
+ git commit --allow-empty -m empty --date="$GIT_AUTHOR_DATE" &&
+ git rebase -m --ignore-date HEAD^ &&
+ test_ctime_is_ignored -2
+'
+
# This must be the last test in this file
test_expect_success '$EDITOR and friends are unchanged' '
test_editor_unchanged
--
2.27.0
next prev parent reply other threads:[~2020-06-26 9:55 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 ` Phillip Wood [this message]
2020-06-26 16:35 ` [PATCH v5 5/5] rebase: add --reset-author-date 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=20200626095528.117524-6-phillip.wood123@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).