Re: Question about git rebase --onto

Pascal Obry [off-list ref] writes:

quoted

Writing reproducible test case would be a great way to diagnose this.

I just can't reproduce now! I've tried on a second machine starting from
the same repository state and still can't reproduce! So either I was in
really bad shape last night or it was some kind of transient problem on
my Cygwin/Git system.

Sorry for the noise.

Don't be sorry.  We need to know about issues, and sporadic failures, if
they are real, are the ones that affects people the worst way.

Thanks for spending time to reproduce---and please do report (and preserve
the reproducible state if possible) when you see a breakage (like this
one, or some other form) next time.

Junio,

Thanks for spending time to reproduce---and please do report (and preserve
the reproducible state if possible) when you see a breakage (like this
one, or some other form) next time.

I have a reproducer this time.

$ git --version
git version 1.7.0.14.g7e948

$ git clone http://git.sv.gnu.org/r/v2p.git
$ cd v2p/

$ git branch v3.1 origin/v3.1

$ git co -b po/new-context-support origin/po/new-context-support

$ git cherry -v master po/new-context-support
+ bb8647179385ecf2a5053da9a4af9e24437a5b34 Modifications to use the new
AWS's context implementation.
+ 12db018f5a448869b1679550cb2fd0e33336a6c9 Minor reformatting.
+ f7888edb7572ca6d62f35e594d231c7974bc9515 Fix testsuite to pass with
the new context support.

$ git rebase --onto v3.1 HEAD~3 HEAD

At this point I'm on a detached HEAD.

$ git status
# Not currently on any branch.
nothing to commit (working directory clean)

Let me know if you need additional information.

Pascal.

-- 

--|------------------------------------------------------
--| Pascal Obry                           Team-Ada Member
--| 45, rue Gabriel Peri - 78114 Magny Les Hameaux FRANCE
--|------------------------------------------------------
--|    http://www.obry.net  -  http://v2p.fr.eu.org
--| "The best way to travel is by means of imagination"
--|
--| gpg --keyserver keys.gnupg.net --recv-key F949BD3B

Hi,

On Wed, Feb 17, 2010 at 5:25 PM, Pascal Obry [off-list ref] wrote:

$ git clone http://git.sv.gnu.org/r/v2p.git

in case anyone is wondering, the equivalent git:// url is

  git://git.sv.gnu.org/v2p.git

$ git rebase --onto v3.1 HEAD~3 HEAD

Why do you add the last parameter ("HEAD")? If I run the rebase
without it, it works fine (ie. not on a detached HEAD).

-- 
Cheers,
Ray Chuan

Tay,

Why do you add the last parameter ("HEAD")? If I run the rebase
without it, it works fine (ie. not on a detached HEAD).

Right, without the final HEAD it is working. But it ought to work with
it too. Hence my report.

Pascal.

-- 

--|------------------------------------------------------
--| Pascal Obry                           Team-Ada Member
--| 45, rue Gabriel Peri - 78114 Magny Les Hameaux FRANCE
--|------------------------------------------------------
--|    http://www.obry.net  -  http://v2p.fr.eu.org
--| "The best way to travel is by means of imagination"
--|
--| gpg --keyserver keys.gnupg.net --recv-key F949BD3B

Hi,

On Wed, Feb 17, 2010 at 6:27 PM, Pascal Obry [off-list ref] wrote:

quoted

Why do you add the last parameter ("HEAD")? If I run the rebase
without it, it works fine (ie. not on a detached HEAD).

Right, without the final HEAD it is working. But it ought to work with
it too. Hence my report.

In your original report though, you didn't say "HEAD"; you used a
branch. I quote:

On Wed, Feb 3, 2010 at 1:49 AM, Pascal Obry [off-list ref] wrote:

It seems to me that:

  $ git co topic
  $ git rebase --onto master topic~2 topic

I'm not trying to nit-pick, but it does matter - "git rebase --onto
foo baz~x baz" and "git rebase --onto foo HEAD~x HEAD" are quite
different.

According to the docs, the last parameter <branch> specifies the
branch to checkout to first before the rebasing takes place.
Therefore, I believe the behaviour you're experiencing when you
specify "HEAD" for the <branch> parameter is correct - git does a "git
checkout $(git rev-parse HEAD)", so you start the rebase on a detached
HEAD.

-- 
Cheers,
Ray Chuan

Tay,

I'm not trying to nit-pick, but it does matter - "git rebase --onto
foo baz~x baz" and "git rebase --onto foo HEAD~x HEAD" are quite
different.

Ok, so this was a misunderstanding on my side.

Indeed using:

$ git rebase --onto v3.1 po/new-context-support~3 po/new-context-support

Works fine! Obviously still learning Git :)

Thanks.

Pascal.

-- 

--|------------------------------------------------------
--| Pascal Obry                           Team-Ada Member
--| 45, rue Gabriel Peri - 78114 Magny Les Hameaux FRANCE
--|------------------------------------------------------
--|    http://www.obry.net  -  http://v2p.fr.eu.org
--| "The best way to travel is by means of imagination"
--|
--| gpg --keyserver keys.gnupg.net --recv-key F949BD3B