Re: What's cooking in git.git (Oct 2019, #01; Thu, 3)

From: Phillip Wood <phillip.wood123@gmail.com>
Date: Oct 4, 2019, 09:44 UTC
Message-ID: <972f4674-ed00-7113-24eb-f59f1b751690@gmail.com>
In-Reply-To: <xmqqsgoabes8.fsf@gitster-ct.c.googlers.com>

Hi Junio

On 03/10/2019 06:04, Junio C Hamano wrote:

Show 16 quoted lines

> Here are the topics that have been cooking.  Commits prefixed with
> '-' are only in 'pu' (proposed updates) while commits prefixed with
> '+' are in 'next'.  The ones marked with '.' do not appear in any of
> the integration branches, but I am still holding onto them.
> [...]
> 
> 
> * pw/rebase-i-show-HEAD-to-reword (2019-08-19) 3 commits
>   - sequencer: simplify root commit creation
>   - rebase -i: check for updated todo after squash and reword
>   - rebase -i: always update HEAD before rewording
>   (this branch is used by ra/rebase-i-more-options.)
> 
>   "git rebase -i" showed a wrong HEAD while "reword" open the editor.
> 
>   Will merge to 'next'.

That's great, thanks

Show 14 quoted lines

> 
> * ra/rebase-i-more-options (2019-09-09) 6 commits
>   - rebase: add --reset-author-date
>   - rebase -i: support --ignore-date
>   - sequencer: rename amend_author to author_to_rename
>   - rebase -i: support --committer-date-is-author-date
>   - sequencer: allow callers of read_author_script() to ignore fields
>   - rebase -i: add --ignore-whitespace flag
>   (this branch uses pw/rebase-i-show-HEAD-to-reword.)
> 
>   "git rebase -i" learned a few options that are known by "git
>   rebase" proper.
> 
>   Is this ready for 'next'.

Nearly, but not quite I think cf [1]. Also I'm still not convinced that having different behaviors for --ignore-whitespace depending on the backend is going to be helpful but maybe they are close enough not to matter too much in practice [2].

[1] https://public-inbox.org/git/20190806173638.17510-1-rohit.ashiwal265@gmail.com/T/#m965ce1f09d1d1b8010c04db0eabd4b19ce99fe82

[2] https://public-inbox.org/git/20190806173638.17510-1-rohit.ashiwal265@gmail.com/T/#m94e059c18b7bbcc721d12b190bd4aaecc5e8d591