From: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
To: git@vger.kernel.org
Subject: [RFC PATCH 0/1] rebase --onto detection of already applied commits
Date: Mon, 12 Dec 2022 13:35:15 +0200 [thread overview]
Message-ID: <20221212113516.27816-1-cristian.ciocaltea@collabora.com> (raw)
Let's consider the following operation:
git rebase --onto new-base upstream feature
where 'feature' contains a few commits on top of 'upstream' which need to be
rebased onto 'new-base'.
The problem is that some of those commits have been already applied to
'new-base' and we would like to skip them as in a regular rebase command that
doesn't use '--onto', i.e. expecting to see messages like:
warning: skipped previously applied commit [...]
However, that doesn't happen and we either get
dropping [...] -- patch contents already upstream
or a conflict if one of the rebased commits doesn't resolve to an empty patch
anymore, e.g. due to additional changes applied on the target branch.
This seems to be similar to the behavior of '--reapply-cherry-picks' and cannot
be disabled via '--no-reapply-cherry-picks' or by any other means.
The proposed patch is just a quick workaround, as I'm not sure what would be the
proper or recommended approach to handle the scenario described. Any advice
would be highly appreciated!
Cristian Ciocaltea (1):
rebase --onto: Skip previously applied commits
builtin/rebase.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
--
2.38.1
next reply other threads:[~2022-12-12 11:41 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-12 11:35 Cristian Ciocaltea [this message]
2022-12-12 11:35 ` [RFC PATCH 1/1] rebase --onto: Skip previously applied commits Cristian Ciocaltea
2022-12-12 12:27 ` Ævar Arnfjörð Bjarmason
2022-12-12 15:37 ` Cristian Ciocaltea
2022-12-13 0:13 ` [RFC PATCH 0/1] rebase --onto detection of already " Junio C Hamano
2022-12-13 10:37 ` Cristian Ciocaltea
2022-12-13 12:38 ` Junio C Hamano
2022-12-13 13:04 ` Phillip Wood
2022-12-13 15:34 ` Cristian Ciocaltea
2022-12-15 15:40 ` Phillip Wood
2022-12-15 16:02 ` Cristian Ciocaltea
2022-12-15 17:07 ` 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=20221212113516.27816-1-cristian.ciocaltea@collabora.com \
--to=cristian.ciocaltea@collabora.com \
--cc=git@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).