Commits on Aug 19, 2024

1. git: Use merge-tree in patchsets …

   Previously patchsets used a hacky invocation of update-index
   to overlay changed files from old tree to new tree. In addition
   to being slower than necessary, this has the downside of showing
   upstream changes in the diff, even those that were not changed
   in the given review upload.
   
   Using git merge-tree for this instead is cleaner, faster, and better.
   We do this by "cherry-picking" the old branch with git merge-tree, but providing -X ours as
   the strategy. This provides a tree that looks like the new base with the old changes applied.
   For cases where the old changes don't apply cleanly, the ours strategy prevents conflicts by
   taking the version in the old tree. Although this can be a bit confusing when looking at the
   file as a whole, it provides a succinct way to view a difference between the old version and
   new version.
   
   Fixes: #183

   

   jerry-skydio committed Aug 19, 2024
   Configuration menu

   • View commit details
   • Copy full SHA for 6729d4f
   • Browse repository at this point

   Copy the full SHA

   6729d4f View commit details

   Browse the repository at this point in the history