Skip to content
  • Elijah Newren's avatar
    Recommend git-filter-repo instead of git-filter-branch · 9df53c5d
    Elijah Newren authored and Junio C Hamano's avatar Junio C Hamano committed
    
    
    filter-branch suffers from a deluge of disguised dangers that disfigure
    history rewrites (i.e. deviate from the deliberate changes).  Many of
    these problems are unobtrusive and can easily go undiscovered until the
    new repository is in use.  This can result in problems ranging from an
    even messier history than what led folks to filter-branch in the first
    place, to data loss or corruption.  These issues cannot be backward
    compatibly fixed, so add a warning to both filter-branch and its manpage
    recommending that another tool (such as filter-repo) be used instead.
    
    Also, update other manpages that referenced filter-branch.  Several of
    these needed updates even if we could continue recommending
    filter-branch, either due to implying that something was unique to
    filter-branch when it applied more generally to all history rewriting
    tools (e.g. BFG, reposurgeon, fast-import, filter-repo), or because
    something about filter-branch was used as an example despite other more
    commonly known examples now existing.  Reword these sections to fix
    these issues and to avoid recommending filter-branch.
    
    Finally, remove the section explaining BFG Repo Cleaner as an
    alternative to filter-branch.  I feel somewhat bad about this,
    especially since I feel like I learned so much from BFG that I put to
    good use in filter-repo (which is much more than I can say for
    filter-branch), but keeping that section presented a few problems:
      * In order to recommend that people quit using filter-branch, we need
        to provide them a recomendation for something else to use that
        can handle all the same types of rewrites.  To my knowledge,
        filter-repo is the only such tool.  So it needs to be mentioned.
      * I don't want to give conflicting recommendations to users
      * If we recommend two tools, we shouldn't expect users to learn both
        and pick which one to use; we should explain which problems one
        can solve that the other can't or when one is much faster than
        the other.
      * BFG and filter-repo have similar performance
      * All filtering types that BFG can do, filter-repo can also do.  In
        fact, filter-repo comes with a reimplementation of BFG named
        bfg-ish which provides the same user-interface as BFG but with
        several bugfixes and new features that are hard to implement in
        BFG due to its technical underpinnings.
    While I could still mention both tools, it seems like I would need to
    provide some kind of comparison and I would ultimately just say that
    filter-repo can do everything BFG can, so ultimately it seems that it
    is just better to remove that section altogether.
    
    Signed-off-by: default avatarElijah Newren <newren@gmail.com>
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
    9df53c5d