Re: [PATCH v2 5/7] rebase: drop support for `--preserve-merges`

From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Sep 2, 2021, 15:34 UTC
Message-ID: <878s0f9ei8.fsf@evledraar.gmail.com>
In-Reply-To: <87czpr9fwz.fsf@evledraar.gmail.com>

On Thu, Sep 02 2021, Ævar Arnfjörð Bjarmason wrote:

Show 15 quoted lines

> On Thu, Sep 02 2021, Ævar Arnfjörð Bjarmason wrote:
>
>> On Wed, Sep 01 2021, Johannes Schindelin via GitGitGadget wrote:
>>
>>>  git-rebase--preserve-merges.sh | 1057 --------------------------------
>>
>> You could, but certainly don't have to, squash in the below. I.e. this
>> is the last user of eval_ngettext!
>
> Also get_author_ident_from_commit() in git-sh-setup.sh and
> Documentation/git-sh-setup.txt can be removed,
> git-rebase--preserve-merges.sh is the last user of it.
>
> I looked over the other git-sh-setup functions, it seems that's the only
> one that could be removed along with git-rebase--preserve-merges.sh.

Although with git-rebase--preserve-merges.sh gone the get_author_ident_from_commit(), parse_ident_from_commit() and pick_ident_script() can all be moved to its last user: git-filter-branch.sh