git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephan Beyer <s-beyer@gmx.net>
To: Thomas Rast <trast@student.ethz.ch>
Cc: git@vger.kernel.org, Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: [BUG?] rebase -i -p leaves index changed
Date: Wed, 13 Aug 2008 22:51:03 +0200	[thread overview]
Message-ID: <20080813205103.GB10758@leksak.fem-net> (raw)
In-Reply-To: <200808121116.41535.trast@student.ethz.ch>

[-- Attachment #1: Type: text/plain, Size: 1748 bytes --]

Hi,

Thomas Rast wrote:
> 'rebase -i -p' appears to be a bit confused about what it is doing.
> Try a history like this:
> 
>   O -- A -- M -- B
>    \       /
>     \- C -/
> 
> built by:
> 
>   git init
>   touch foo
>   git add foo
>   git ci -m initial
>   git tag root
>   git co -b side

Puh, it is nice that you provide a sequence how you generated your test
case, but "ci" and "co" are no git commands.  Ok, because of the
sequence it was clear to me that you mean "commit" and "checkout",
but I couldn't just c&p it into my xterm :(
;-)

> Second, 'edit' is also a bit suspicious:
> 
>   git reset --hard
>   GIT_EDITOR='perl -i -pe "s/pick 096/edit 096/"' git rebase -i -p root

This perl expression does nothing if your commit is not prefixed with 096 ;)
But I tested by changing the line of commit "a" to "edit".

> Despite claiming "Stopped at 096[...] a", a quick 'git show' tells us
> that it is actually stuck at 'initial'.  (At least 'git rebase
> --continue' then ends up with the same result as the first test.)

Regarding your [BUG?]: this is a bug, definitely.

> Granted, I'm not entirely sure what it _should_ do.  In my use case
> (relating to the filter-branch topic), C was a commit from elsewhere
> that B depended on.  So I kind of hoped 'rebase -i -p' would let me
> edit A, then rebuild M and B on top, while leaving C alone.

I think your hope is right.  So this is also a bug.

I tested this with my sequencer-based rebase -i -p first and it worked
as you hope. I tested it with your v2 patches and it works, too. ;)
So I'm having a deeper look at your patches in some minutes...

Regards,
  Stephan

-- 
Stephan Beyer <s-beyer@gmx.net>, PGP 0x6EDDD207FCC5040F

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

      parent reply	other threads:[~2008-08-13 20:52 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-08-12  9:16 [BUG?] rebase -i -p leaves index changed Thomas Rast
2008-08-13 10:04 ` [PATCH 1/2] rebase -i -p: handle index and workdir correctly Thomas Rast
2008-08-13 10:04   ` [PATCH 2/2] rebase -i -p: fix parent rewriting Thomas Rast
2008-08-13 10:07   ` [PATCH 1/2] rebase -i -p: handle index and workdir correctly Thomas Rast
2008-08-13 11:56     ` [PATCH v2 " Thomas Rast
2008-08-13 11:57       ` [PATCH v2 2/2] rebase -i -p: fix parent rewriting Thomas Rast
2008-08-13 20:58       ` [PATCH v2 1/2] rebase -i -p: handle index and workdir correctly Stephan Beyer
2008-08-13 21:41         ` [PATCH v3 " Thomas Rast
2008-08-13 21:41           ` [PATCH v3 2/2] rebase -i -p: fix parent rewriting Thomas Rast
2008-08-13 20:51 ` Stephan Beyer [this message]

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=20080813205103.GB10758@leksak.fem-net \
    --to=s-beyer@gmx.net \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=trast@student.ethz.ch \
    /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).