From: Johannes Sixt <j6t@kdbg•org>
To: Andrew Wong <andrew.kw.w@gmail•com>
Cc: git@vger•kernel.org
Subject: Re: [PATCH] Interactive-rebase doesn't pick all children of "upstream"
Date: Sun, 05 Jun 2011 11:16:15 +0200 [thread overview]
Message-ID: <4DEB495F.9080900@kdbg.org> (raw)
In-Reply-To: <1307251953-25116-1-git-send-email-andrew.kw.w@gmail.com>
Am 05.06.2011 07:32, schrieb Andrew Wong:
> Consider this graph:
>
> D---E (topic, HEAD)
> / /
> A---B---C (master)
> \
> F (topic2)
>
> and the following three commands:
> 1. git rebase -i A
> 2. git rebase -i --onto F A
> 3. git rebase -i B
>
> Currently, (1) and (2) will pick B, D, C, and E onto A and F,
> respectively. However, (3) will only pick D and E onto B. This
> behavior of (3) is inconsistent with (1) and (2), and we cannot modify C
> in the interactive-rebase.
I cannot reproduce your claims:
- (1) and (2) picks B,C,D top A and F, but not E because E is a merge.
- (3) picks C and D, but not E because E is a merge.
> The current behavior also creates a bug if we do:
> 4. git rebase -i C
>
> In (4), E is never picked. And since interactive-rebase resets "HEAD" to
> "onto" before picking any commits, D and E are lost after the
> interactive-rebase.
(4) picks only D, because E is a merge. I don't understand what you mean
that "D and E are lost"; E is not picked in the first place, but D is in
the todo-list; how can D be lost?
BTW, rebase never picks merges by design. I don't see anything wrong so
far with the current behavior. Please explain!
-- Hannes
next prev parent reply other threads:[~2011-06-05 9:21 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-16 10:33 [BUG] rebase -p loses commits Jeff King
2011-05-16 19:42 ` Andrew Wong
2011-05-16 20:36 ` Junio C Hamano
2011-05-17 0:33 ` Andrew Wong
2011-05-17 0:54 ` Junio C Hamano
2011-05-17 1:02 ` Junio C Hamano
2011-05-17 5:44 ` Jeff King
2011-05-17 16:07 ` Andrew Wong
2011-05-17 16:12 ` Jeff King
2011-05-21 5:51 ` [RFC] Interactive-rebase doesn't pick all children of "upstream" Andrew Wong
2011-05-21 5:51 ` Andrew Wong
2011-05-21 7:34 ` Andrew Wong
2011-06-05 5:32 ` [PATCH] " Andrew Wong
2011-06-05 9:16 ` Johannes Sixt [this message]
2011-06-05 14:11 ` Andrew Wong
2011-06-07 4:08 ` [PATCH v2] rebase -i -p: doesn't pick certain merge commits that are " Andrew Wong
2011-06-07 4:08 ` [PATCH] " Andrew Wong
2011-06-12 16:28 ` Andrew Wong
2011-06-13 16:01 ` Junio C Hamano
2011-06-13 17:30 ` Andrew Wong
2011-06-16 22:24 ` Stephen Haberman
2011-06-18 6:40 ` Andrew Wong
2011-06-18 15:17 ` Stephen Haberman
2011-06-18 16:47 ` Andrew Wong
2011-06-18 17:12 ` Stephen Haberman
2011-06-18 22:12 ` [PATCH] rebase -i -p: include non-first-parent commits in todo list Andrew Wong
2011-06-18 22:13 ` [PATCH] rebase -i -p: doesn't pick certain merge commits that are children of "upstream" Andrew Wong
2011-05-17 5:39 ` [BUG] rebase -p loses commits Jeff King
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=4DEB495F.9080900@kdbg.org \
--to=j6t@kdbg$(echo .)org \
--cc=andrew.kw.w@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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