From: Andrew Wong <andrew.w@sohovfx.com>
To: Andrew Wong <andrew.kw.w@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [RFC] Interactive-rebase doesn't pick all children of "upstream"
Date: Sat, 21 May 2011 03:34:21 -0400 [thread overview]
Message-ID: <4DD76AFD.8040504@sohovfx.com> (raw)
In-Reply-To: <1305957078-19111-2-git-send-email-andrew.kw.w@gmail.com>
On 11-05-21 1:51 AM, Andrew Wong wrote:
> preserve=t
> for p in $(git rev-list --parents -1 $sha1 | cut -d' ' -s -f2-)
> do
> - if test -f "$rewritten"/$p -a \( $p != $onto -o $sha1 = $first_after_upstream \)
> + if test -f "$rewritten"/$p&& (
> + test $p != $onto ||
> + expr "$commits_after_upstream" ":" ".*$sha1.*"
> + )
> then
> preserve=f
> fi
Actually, I think this change might be effectively the same as removing
both of the OR-conditions, which leaves only the "test -f" condition.
That means commits are never skipped.
I guess this goes back to my first response to this issue. What kind of
commits are skipped by the changes introduced in commit
d80d6bc146232d81f1bb4bc58e5d89263fd228d4 ?
next prev parent reply other threads:[~2011-05-21 7:34 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 [this message]
2011-06-05 5:32 ` [PATCH] " Andrew Wong
2011-06-05 9:16 ` Johannes Sixt
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=4DD76AFD.8040504@sohovfx.com \
--to=andrew.w@sohovfx.com \
--cc=andrew.kw.w@gmail.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 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.