From: K Jayatheerth <jayatheerthkulkarni2005@gmail.com>
Date: Thu, 11 Dec 2025 05:35:03 GMT
Subject: Re: bug: `git pull --rebase` breaks in the presence of pushurls
Message-ID: <20251211053504.8758-1-jayatheerthkulkarni2005@gmail.com>
In-Reply-To: <xmqqpl8lg0u3.fsf@gitster.g>

I’m trying to make sure I fully understand where the fork-point behavior is coming from.
I'm assuming get_rebase_fork_point() and get_rebase_newbase_and_upstream() are responsible.

And when we talk about the “fork-point heuristic” here,
we mean the logic that uses the reflog of the upstream branch
to detect whether the user has previously rebased or reset,
and uses that information to choose a
different merge-base than the raw merge-base HEAD upstream, correct?

Just checking that I’m following correctly
before thinking about possible approaches.