From: "Uwe Kleine-König" <Uwe.Kleine-Koenig@digi.com>
To: git@vger.kernel.org
Subject: Re: another git rebase -i problem
Date: Fri, 15 Feb 2008 10:21:35 +0100 [thread overview]
Message-ID: <20080215092135.GB12091@digi.com> (raw)
In-Reply-To: <20080214093730.GA20408@digi.com>
Hello (Dscho),
> And moreover I have a more complicated history here with git rebase
> failing but I think this here is not my problem :-(
I currently have no time to have a deeper look into that either, but
here comes the more complicated case, just for the record:
ukleinek@zentaur:~/gsrc/linux-2.6$ git rev-parse HEAD
57db5b05c27d8c6d66264251ee1124c762aee659
ukleinek@zentaur:~/gsrc/linux-2.6$ git rev-parse linus/master
4ee29f6a52158cea526b16a44ae38643946103ec
ukleinek@zentaur:~/gsrc/linux-2.6$ git status
# On branch master
nothing to commit (working directory clean)
ukleinek@zentaur:~/gsrc/linux-2.6$ git rebase -i -p linus/master
...
(squash 57db5b0 onto d528ae7)
...
(write commit log for d528ae7+57db5b0)
...
Successfully rebased and updated refs/heads/master.
ukleinek@zentaur:~/gsrc/linux-2.6$ git status
# On branch master
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: Documentation/00-INDEX
# new file: Documentation/cpuidle/core.txt
# new file: Documentation/cpuidle/driver.txt
# new file: Documentation/cpuidle/governor.txt
# new file: Documentation/cpuidle/sysfs.txt
# modified: MAINTAINERS
# modified: arch/alpha/kernel/osf_sys.c
# modified: arch/arm/mach-ns9xxx/Kconfig
# modified: arch/arm/mach-ns9xxx/Makefile
# deleted: arch/arm/mach-ns9xxx/plat-leds-gpio.c
# modified: arch/blackfin/kernel/traps.c
# modified: arch/cris/arch-v10/lib/memset.c
# modified: arch/cris/arch-v32/lib/memset.c
# modified: arch/m68knommu/platform/5206/Makefile
# modified: arch/m68knommu/platform/5206e/Makefile
# modified: arch/m68knommu/platform/520x/Makefile
# modified: arch/m68knommu/platform/523x/Makefile
# modified: arch/m68knommu/platform/5249/Makefile
# modified: arch/m68knommu/platform/5272/Makefile
# modified: arch/m68knommu/platform/527x/Makefile
# modified: arch/m68knommu/platform/528x/Makefile
# modified: arch/m68knommu/platform/5307/Makefile
# modified: arch/m68knommu/platform/532x/Makefile
# modified: arch/m68knommu/platform/5407/Makefile
# modified: arch/m68knommu/platform/coldfire/Makefile
# modified: arch/m68knommu/platform/coldfire/entry.S
# modified: arch/m68knommu/platform/coldfire/timers.c
...
ukleinek@zentaur:~/gsrc/linux-2.6$ git show
commit 57db5b05c27d8c6d66264251ee1124c762aee659
...
I tracked the problem down to NEWHEAD being wrong. The update-ref
before warn "Successfully rebased and updated $HEADNAME." has
NEWHEAD=OLDHEAD because
.git/.dotest-merge/rewritten/57db5b05c27d8c6d66264251ee1124c762aee659
contains 57db5b05c27d8c6d66264251ee1124c762aee659 itself.
If you want to experiment with that, you can get
57db5b05c27d8c6d66264251ee1124c762aee659 from the bundle at
http://www.modarm9.com/~ukleinek/57db5b05c2
Best regards
Uwe
--
Uwe Kleine-König, Software Engineer
Digi International GmbH Branch Breisach, Küferstrasse 8, 79206 Breisach, Germany
Tax: 315/5781/0242 / VAT: DE153662976 / Reg. Amtsgericht Dortmund HRB 13962
prev parent reply other threads:[~2008-02-15 9:22 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-14 9:37 another git rebase -i problem Uwe Kleine-König
2008-02-14 12:35 ` Johannes Schindelin
2008-02-14 13:02 ` Uwe Kleine-König
2008-02-14 15:39 ` Johannes Schindelin
2008-02-15 8:10 ` Uwe Kleine-König
2008-02-15 9:21 ` Uwe Kleine-König [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=20080215092135.GB12091@digi.com \
--to=uwe.kleine-koenig@digi.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 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).