From: Junio C Hamano <gitster@pobox.com>
To: Phillip Wood <phillip.wood123@gmail.com>
Cc: Kartik Agaram <ak@akkartik.com>, git@vger.kernel.org
Subject: Re: bug: `git pull --rebase` breaks in the presence of pushurls
Date: Thu, 11 Dec 2025 12:21:40 +0900 [thread overview]
Message-ID: <xmqqpl8lg0u3.fsf@gitster.g> (raw)
In-Reply-To: <61f61218-1945-4efe-961a-e6cb4ac8c6a9@gmail.com> (Phillip Wood's message of "Wed, 10 Dec 2025 14:25:32 +0000")
Phillip Wood <phillip.wood123@gmail.com> writes:
> "git pull" already runs "git merge-base --fork-point" before it runs
> "git fetch". The problematic reflog entry comes from a previous push
> which pushes to a different server due to remote.<remote>.pushurl.
Ah, of course. fork-point heuristics with a repository you yourself
push into would not make all that sense, since you are in control
when and what to push there in the first place :/.
> Because we've just successfully pushed the local branch the fork point
> calculation thinks the remote tracking branch matches the local branch
> and so excludes all the local commits when we rebase but we didn't push
> it to the same server that we're fetching from. I wonder if we should
> disable the fork point calculation when there is a pushurl set.
Tempting thought. Or educate users with diagnoses and advise()?
next prev parent reply other threads:[~2025-12-11 3:21 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-07 21:55 bug: `git pull --rebase` breaks in the presence of pushurls Kartik Agaram
2025-12-08 14:30 ` Phillip Wood
2025-12-08 16:04 ` Phillip Wood
2025-12-08 16:43 ` Kartik Agaram
2025-12-08 22:24 ` Junio C Hamano
2025-12-09 1:48 ` Kartik Agaram
2025-12-09 16:03 ` Phillip Wood
2025-12-10 14:25 ` Phillip Wood
2025-12-11 3:21 ` Junio C Hamano [this message]
2025-12-11 5:35 ` K Jayatheerth
2025-12-11 15:54 ` Phillip Wood
2025-12-11 19:39 ` Phillip Wood
2025-12-11 15:56 ` Phillip Wood
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqpl8lg0u3.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=ak@akkartik.com \
--cc=git@vger.kernel.org \
--cc=phillip.wood123@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.