Hi Junio On 26/06/2020 17:35, Junio C Hamano wrote: > Phillip Wood <phillip.wood123@xxxxxxxxx> writes: > >> From: Rohit Ashiwal <rohit.ashiwal265@xxxxxxxxx> >> >> 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@xxxxxxxxx> > > Hmph, did I? Yes, you added a fixup d82dfa7f5b ("rebase -i: finishing touches to --reset-author-date", 2019-11-21) which I squashed into this patch > >> + 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")), > > It is merely hidden but still supported. > >> 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 >> ' > > Are there still some tests that check "--ignore-date"? We probably > should have them, if we are not removing the support. This patch converts the existing --ignore-date tests to use --reset-author-date and adds a single new test at the end to check --ignore-date Best Wishes Phillip > > Thanks. The entire series looked reasonable to me. >