* Strange behavior with git rebase (-i)
@ 2008-02-02 10:44 Stefan (metze) Metzmacher
2008-02-02 15:42 ` Johannes Schindelin
0 siblings, 1 reply; 5+ messages in thread
From: Stefan (metze) Metzmacher @ 2008-02-02 10:44 UTC (permalink / raw
To: git
[-- Attachment #1: Type: text/plain, Size: 1145 bytes --]
Hi,
I just hit a really strange thing:
I was on a branch called 'v4-0-test',
then I did a git rebase -i orgin/v4-0-test
and removed some patches and prefixed all others
with 'edit'.
Then:
git commit --amend
git rebase --continue
git commit --amend
git rebase --continue
git commit --amend
git commit --amend (again)
git branch
* v4-0-test
git log
(this showed what I wanted)
git show -p --stat
(to really make sure that the top revision is the one I want)
git push origin v4-0-test
And this pushed the top revision BEFORE the rebase!!!
Because I forgot a 'git rebase --continue' to finalize the rebase.
In the end it's my fault, because I forgot the last rebase --continue,
but I think it's bad that git behaves that way.
Would it be possible to disable some operations while others
are unfinished, git am (-i) might have similar effects.
I was using git 1.5.3.2
Could it be that 6fd2f5e60d4d574ff9e5dd8ce1e229328c785d69 was
created to fix a similar problem?
metze
http://gitweb.samba.org/?p=samba.git;a=commit;h=ec0ee2aa5f4bef32f09a426d91c28c985f843038
and the 10 commits before...:-(
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 249 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Strange behavior with git rebase (-i)
2008-02-02 10:44 Strange behavior with git rebase (-i) Stefan (metze) Metzmacher
@ 2008-02-02 15:42 ` Johannes Schindelin
2008-02-02 16:25 ` Steven Walter
0 siblings, 1 reply; 5+ messages in thread
From: Johannes Schindelin @ 2008-02-02 15:42 UTC (permalink / raw
To: Stefan (metze) Metzmacher; +Cc: git
Hi,
On Sat, 2 Feb 2008, Stefan (metze) Metzmacher wrote:
> [started git rebase -i]
> git commit --amend (again)
> git branch
> * v4-0-test
> git log
> (this showed what I wanted)
> git show -p --stat
> (to really make sure that the top revision is the one I want)
> git push origin v4-0-test
> And this pushed the top revision BEFORE the rebase!!!
> Because I forgot a 'git rebase --continue' to finalize the rebase.
I don't believe it. "git branch" would have shown "* (no branch)" as
current branch, unless the rebase is finalized.
git rebase -i works on a _detached_ HEAD, for two reasons:
- easier working with reflogs (as the branch's reflog shows before rebase
and after rebase, but nothing in between), and
- to prevent exactly the scenario you are describing.
Ciao,
Dscho
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Strange behavior with git rebase (-i)
2008-02-02 15:42 ` Johannes Schindelin
@ 2008-02-02 16:25 ` Steven Walter
2008-02-02 17:08 ` Johannes Schindelin
0 siblings, 1 reply; 5+ messages in thread
From: Steven Walter @ 2008-02-02 16:25 UTC (permalink / raw
To: Johannes Schindelin; +Cc: git
On Sat, Feb 02, 2008 at 03:42:06PM +0000, Johannes Schindelin wrote:
> I don't believe it. "git branch" would have shown "* (no branch)" as
> current branch, unless the rebase is finalized.
>
> git rebase -i works on a _detached_ HEAD, for two reasons:
> On Sat, 2 Feb 2008, Stefan (metze) Metzmacher wrote:
> > I was using git 1.5.3.2
Did rebase -i in git 1.5.3.2 use a detached head? I thought that was
new in 1.5.4.
--
-Steven Walter <stevenrwalter@gmail.com>
Freedom is the freedom to say that 2 + 2 = 4
B2F1 0ECC E605 7321 E818 7A65 FC81 9777 DC28 9E8F
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Strange behavior with git rebase (-i)
2008-02-02 16:25 ` Steven Walter
@ 2008-02-02 17:08 ` Johannes Schindelin
2008-02-03 1:21 ` Stefan (metze) Metzmacher
0 siblings, 1 reply; 5+ messages in thread
From: Johannes Schindelin @ 2008-02-02 17:08 UTC (permalink / raw
To: Steven Walter; +Cc: git
Hi,
On Sat, 2 Feb 2008, Steven Walter wrote:
> On Sat, Feb 02, 2008 at 03:42:06PM +0000, Johannes Schindelin wrote:
> > I don't believe it. "git branch" would have shown "* (no branch)" as
> > current branch, unless the rebase is finalized.
> >
> > git rebase -i works on a _detached_ HEAD, for two reasons:
>
> > On Sat, 2 Feb 2008, Stefan (metze) Metzmacher wrote:
> > > I was using git 1.5.3.2
>
> Did rebase -i in git 1.5.3.2 use a detached head? I thought that was
> new in 1.5.4.
rebase -i uses a detached HEAD since it was merged. In 1.5.4, rebase
(note the absence of -i) uses a detached HEAD, too.
Ciao,
Dscho
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Strange behavior with git rebase (-i)
2008-02-02 17:08 ` Johannes Schindelin
@ 2008-02-03 1:21 ` Stefan (metze) Metzmacher
0 siblings, 0 replies; 5+ messages in thread
From: Stefan (metze) Metzmacher @ 2008-02-03 1:21 UTC (permalink / raw
To: Johannes Schindelin; +Cc: Steven Walter, git
[-- Attachment #1: Type: text/plain, Size: 799 bytes --]
Johannes Schindelin schrieb:
> Hi,
>
> On Sat, 2 Feb 2008, Steven Walter wrote:
>
>> On Sat, Feb 02, 2008 at 03:42:06PM +0000, Johannes Schindelin wrote:
>>> I don't believe it. "git branch" would have shown "* (no branch)" as
>>> current branch, unless the rebase is finalized.
>>>
>>> git rebase -i works on a _detached_ HEAD, for two reasons:
>>> On Sat, 2 Feb 2008, Stefan (metze) Metzmacher wrote:
>>>> I was using git 1.5.3.2
>> Did rebase -i in git 1.5.3.2 use a detached head? I thought that was
>> new in 1.5.4.
>
> rebase -i uses a detached HEAD since it was merged. In 1.5.4, rebase
> (note the absence of -i) uses a detached HEAD, too.
Hmm, I can't reproduce this...maybe I was just to stupid and didn't look
at the git branch output carefully...
metze
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 249 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2008-02-03 1:22 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-02-02 10:44 Strange behavior with git rebase (-i) Stefan (metze) Metzmacher
2008-02-02 15:42 ` Johannes Schindelin
2008-02-02 16:25 ` Steven Walter
2008-02-02 17:08 ` Johannes Schindelin
2008-02-03 1:21 ` Stefan (metze) Metzmacher
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).