From: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
To: git@vger.kernel.org
Subject: [RFC PATCH 1/1] rebase --onto: Skip previously applied commits
Date: Mon, 12 Dec 2022 13:35:16 +0200 [thread overview]
Message-ID: <20221212113516.27816-2-cristian.ciocaltea@collabora.com> (raw)
In-Reply-To: <20221212113516.27816-1-cristian.ciocaltea@collabora.com>
When rebase is used with '--onto <newbase>', the patches that might have
been already applied on <newbase> are not detected, unless they resolve
to an empty commit. When the related files contain additional changes
merged, the rebase operation fails due to conflicts that require manual
intervention.
Ensure the '--onto' variant behaviour is consistent with the common
rebase by dropping the already applied commits on the target branch.
Note the current behavior is still reachable by using the
'--reapply-cherry-picks' flag.
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
---
builtin/rebase.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/builtin/rebase.c b/builtin/rebase.c
index b22768ca5b9f..2907c6db5cce 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1659,8 +1659,12 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
strbuf_addstr(&buf, "...");
strbuf_addstr(&buf, branch_name);
options.onto_name = xstrdup(buf.buf);
- } else if (!options.onto_name)
+ } else if (!options.onto_name) {
options.onto_name = options.upstream_name;
+ } else if (options.upstream) {
+ options.restrict_revision = options.upstream;
+ options.upstream = NULL;
+ }
if (strstr(options.onto_name, "...")) {
if (get_oid_mb(options.onto_name, &branch_base) < 0) {
if (keep_base)
--
2.38.1
next prev parent 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 [RFC PATCH 0/1] rebase --onto detection of already applied commits Cristian Ciocaltea
2022-12-12 11:35 ` Cristian Ciocaltea [this message]
2022-12-12 12:27 ` [RFC PATCH 1/1] rebase --onto: Skip previously " Æ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-2-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).