Re: [PATCH v5 5/5] rebase: add --reset-author-date
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jun 26, 2020, 16:35 UTC
- Message-ID
- <xmqqbll5hjit.fsf@gitster.c.googlers.com>
- In-Reply-To
- <20200626095528.117524-6-phillip.wood123@gmail.com>
Phillip Wood <phillip.wood123@gmail.com> writes:
Show 7 quoted lines
> 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>
Hmph, did I?
> + 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.
Show 15 quoted lines
> 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.
Thanks. The entire series looked reasonable to me.