Commits on Sep 24, 2023

1. fix(amend): support amending merge commits …

   Previously, `Repo::get_paths_touched_by_commit` returned `None` if the commit was a merge commit, the idea being that a merge commit doesn't have a single correct "patch". However, no call-site cared about this interpretation, and all call-sites worked just as well or better with the new interpretation, where we return the union of all changed paths with respect to all parents. Usually, the impact is that the dehydrated commit is a slightly larger commit than normal.
   
   `git amend` was failing when `HEAD` was a merge commit for this reason, since the "fast amend" path first dehydrated the current commit. Before this commit, git-branchless would panic; after this commit, it successfully amends the merge commit.
   
   Note that the `--merge` option to `git amend` is unrelated: it deals with restacking and merging descendant commits after the amend has been carried out.

   

   arxanas committed Sep 24, 2023
   Configuration menu

   • View commit details
   • Copy full SHA for 3af54f8
   • Browse repository at this point

   Copy the full SHA

   3af54f8 View commit details

   Browse the repository at this point in the history