All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andrew Wong <andrew.w@sohovfx.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org
Subject: Re: [BUG] rebase -p loses commits
Date: Mon, 16 May 2011 15:42:40 -0400	[thread overview]
Message-ID: <4DD17E30.6030607@sohovfx.com> (raw)
In-Reply-To: <20110516103354.GA23564@sigill.intra.peff.net>

On 05/16/2011 06:33 AM, Jeff King wrote:
> I was trying to reproduce somebody's issue with a minimal test case, and
> I ran across this setup wherein "rebase -p" silently drops some commits:
>   

This particular patch seems to have something to do with the bug:
    d80d6bc146232d81f1bb4bc58e5d89263fd228d4
    http://thread.gmane.org/gmane.comp.version-control.git/98247/focus=98251

However, I can't figure out what the "odd boundary case" that this patch
was supposed to fix is. Anyone have any idea?

Andrew

  reply	other threads:[~2011-05-16 19:42 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 [this message]
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
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=4DD17E30.6030607@sohovfx.com \
    --to=andrew.w@sohovfx.com \
    --cc=git@vger.kernel.org \
    --cc=peff@peff.net \
    /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.