git-explode icon indicating copy to clipboard operation
git-explode copied to clipboard

Warn about base vs head relationship

Open Werkov opened this issue 1 year ago • 0 comments

I inadvertently passed a base commit that was not an ancestory of head and exploded branch could not be cherry-picked cleanly on top of base (because of head..base changes).

pygit2 does not have an equivalent of git merge-base --is-ancestor, so use the closes approximation by comparing merge base to base. (Hopefully, the "base" is picked by merge_base function when there are multiple merge bases possible so that this ancestor check is corect.)

Werkov avatar Jul 04 '24 23:07 Werkov