Re: [PATCH] rebase --merge: optionally skip upstreamed commits
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Mar 10, 2020, 12:17 UTC
- Message-ID
- <nycvar.QRO.7.76.6.2003101315100.46@tvgsbejvaqbjf.bet>
- In-Reply-To
- <20200309205523.121319-1-jonathantanmy@google.com>
Hi Jonathan,
On Mon, 9 Mar 2020, Jonathan Tan wrote:
Show 15 quoted lines
> When rebasing against an upstream that has had many commits since the > original branch was created: > > O -- O -- ... -- O -- O (upstream) > \ > -- O (my-dev-branch) > > because "git rebase" attempts to exclude commits that are duplicates of > upstream ones, it must read the contents of every novel upstream commit, > in addition to the tip of the upstream and the merge base. This can be a > significant performance hit, especially in a partial clone, wherein a > read of an object may end up being a fetch. > > Add a flag to "git rebase" to allow suppression of this feature. This > flag only works when using the "merge" backend.
I wonder whether we can make this a bit more user-friendly by defaulting to `--right-only` if there are no promised objects in the symmetric range, and if there _are_ promised objects, to skip `--right-only`, possibly with an advice that we did that and how to force it to download the promised objects?
Ciao, Dscho