Commits on Sep 8, 2021

1. t5520: do not use pull.rebase=preserve …

   Even if those tests try to override that setting, let's not use it
   because it is deprecated: let's use `merges` instead.
   
   Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
   Reviewed-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
   Signed-off-by: Junio C Hamano <gitster@pobox.com>

   

   dscho authored and gitster committed Sep 8, 2021
   Copy the full SHA

   6df8755 View commit details

   Browse the repository at this point in the history

2. remote: warn about unhandled branch.<name>.rebase values …

   We ignore them silently, but it actually makes sense to warn the users
   that their config setting has no effect.
   
   Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
   Reviewed-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
   Signed-off-by: Junio C Hamano <gitster@pobox.com>

   

   dscho authored and gitster committed Sep 8, 2021
   Copy the full SHA

   ab7c7c2 View commit details

   Browse the repository at this point in the history

3. tests: stop testing git rebase --preserve-merges …

   This backend has been deprecated in favor of `git rebase
   --rebase-merges`.
   
   In preparation for dropping it, let's remove all the regression tests
   that would need it.
   
   Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
   Reviewed-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
   Signed-off-by: Junio C Hamano <gitster@pobox.com>

   

   dscho authored and gitster committed Sep 8, 2021
   Copy the full SHA

   aa4df10 View commit details

   Browse the repository at this point in the history

4. pull: remove support for --rebase=preserve …

   In preparation for `git-rebase--preserve-merges.sh` entering its after
   life, we remove this (deprecated) option that would still rely on it.
   
   To help users transition who still did not receive the memo about the
   deprecation, we offer a helpful error message instead of throwing our
   hands in the air and saying that we don't know that option, never heard
   of it.
   
   Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
   Reviewed-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
   Signed-off-by: Junio C Hamano <gitster@pobox.com>

   

   dscho authored and gitster committed Sep 8, 2021
   Copy the full SHA

   52f1e82 View commit details

   Browse the repository at this point in the history

5. rebase: drop support for --preserve-merges …

   This option was deprecated in favor of `--rebase-merges` some time ago,
   and now we retire it.
   
   To assist users to transition away, we do not _actually_ remove the
   option, but now we no longer implement the functionality. Instead, we
   offer a helpful error message suggesting which option to use.
   
   Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
   Reviewed-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
   Signed-off-by: Junio C Hamano <gitster@pobox.com>

   

   dscho authored and gitster committed Sep 8, 2021
   Copy the full SHA

   a74b350 View commit details

   Browse the repository at this point in the history

6. git-svn: drop support for --preserve-merges …

   We already passed the `--rebase-merges` option to `git rebase` instead,
   now we make this move permanent.
   
   As pointed out by Ævar Arnfjörð Bjarmason, in contrast to the
   deprecation of `git rebase`'s `--preserve-merges` backend, `git svn`
   only deprecated this option in v2.25.0 (because this developer missed
   `git svn`'s use of that backend when deprecating the rebase backend
   running up to Git v2.22).
   
   Still, v2.25.0 has been released on January 13th, 2020. In other words,
   `git svn` deprecated this option over one and a half years ago, _and_
   has been redirecting to the `--rebase-merges` option during all that
   time (read: `git svn rebase --preserve-merges` didn't do _precisely_
   what the user asked, since v2.25.0, anyway, it fell back to pretending
   that the user asked for `git svn rebase --rebase-merges` instead).
   
   It is time to act on that deprecation and remove that option after all.
   
   Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
   Reviewed-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
   Signed-off-by: Junio C Hamano <gitster@pobox.com>

   

   dscho authored and gitster committed Sep 8, 2021
   Copy the full SHA

   0a159d6 View commit details

   Browse the repository at this point in the history

7. rebase: drop the internal rebase--interactive command …

   It was only used by the `--preserve-merges` backend, which we just
   removed.
   
   Helped-by: Alban Gruin <alban.gruin@gmail.com>
   Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
   Reviewed-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
   Signed-off-by: Junio C Hamano <gitster@pobox.com>

   

   dscho authored and gitster committed Sep 8, 2021
   Copy the full SHA

   5b55b32 View commit details

   Browse the repository at this point in the history

8. rebase: remove obsolete code comment …

   Now that we no longer have a `--preserve-merges` backend, this comment
   needs to be adjusted.
   
   Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
   Reviewed-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
   Signed-off-by: Junio C Hamano <gitster@pobox.com>

   

   dscho authored and gitster committed Sep 8, 2021
   Copy the full SHA

   ff8d6e5 View commit details

   Browse the repository at this point in the history

9. rebase: stop mentioning the -p option in comments …

   We no longer support `--preserve-merges`, therefore it does not make
   sense to keep mentioning that option, even in code comments.
   
   Helped-by: Phillip Wood <phillip.wood123@gmail.com>
   Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
   Reviewed-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
   Signed-off-by: Junio C Hamano <gitster@pobox.com>

   

   dscho authored and gitster committed Sep 8, 2021
   Copy the full SHA

   82db1f8 View commit details

   Browse the repository at this point in the history

10. rebase: remove a no-longer-used function …

    With the `--preserve-merges` option going away, we no longer need this
    function.
    
    Helped-by: Alban Gruin <alban.gruin@gmail.com>
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Reviewed-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>

    

    dscho authored and gitster committed Sep 8, 2021
    Copy the full SHA

    06aa5e4 View commit details

    Browse the repository at this point in the history

11. sequencer: restrict scope of a formerly public function …

    The function to add the `exec` commands to the todo list only needed to
    be public API because it was not only used internally by the sequencer,
    but also by `git rebase --preserve-merges`.
    
    Now that that mode has been removed, we no longer need that function to
    be scoped publicly.
    
    Helped-by: Alban Gruin <alban.gruin@gmail.com>
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Reviewed-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>

    

    dscho authored and gitster committed Sep 8, 2021
    Copy the full SHA

    17919c3 View commit details

    Browse the repository at this point in the history