You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
When upstream truly diverged from the downstream repository, a merge
base needs to be determined, otherwise the merge will fail with:
fatal: refusing to merge unrelated histories
Unfortunately, merge base calculation will also fail when one of the
branches is _shallow_, in which case the error message is actually
highly misleading.
Let's just ensure that we do not have a shallow clone when running in a
fork. There would be an opportunity to make this logic smarter, by using
the GitHub REST API to check whether there _are_ upstream commits that
aren't reachable from the downstream HEAD, but https://xkcd.com/1205/...
Signed-off-by: Johannes Schindelin <[email protected]>
0 commit comments