From: "H. Peter Anvin" <hpa@zytor•com>
To: Alex Riesen <raa.lkml@gmail•com>
Cc: Git Mailing List <git@vger•kernel.org>
Subject: Re: git rebase chokes on directory -> symlink -> directory
Date: Tue, 08 May 2007 19:43:49 -0700 [thread overview]
Message-ID: <46413565.3090503@zytor.com> (raw)
In-Reply-To: <20070508215009.GA2670@steel.home>
Alex Riesen wrote:
>
> What kind of manual fixup did you do? I tried to reproduce it, and did
> the following:
>
> git clone --reference ~/linux.git git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-newsetup.git
> cd linux-2.6-newsetup.git
> git rebase a989705c4cf6e6c1a339c95f9daf658b4ba88ca8
>
> It stopped at 'Revert "x86-64: Make arch/x86-64/boot a symlink to
> arch/i386/boot"' aka cd312503f8e8a88895b12bf810677406284142e6.
> I went on:
>
> rm arch/x86-64/boot
> git checkout cd312503f8e8a88895b12bf810677406284142e6 arch/x86-64/boot
> git rebase --continue
>
> And then it just continued until all commits were rebased.
> I have a very recent git, so maybe that's why it worked.
>
Mine stops already at the directory -> symlink checkin (the above is the
symlink -> directory one), but your trick of using "git checkout" as a
trick to resolve things helped for both... eventually :-/
Either way, it's still a bug that it stops for either checkin, but it's
not blocking my work anymore.
-hpa
next prev parent reply other threads:[~2007-05-09 2:44 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-08 1:08 git rebase chokes on directory -> symlink -> directory H. Peter Anvin
2007-05-08 21:50 ` Alex Riesen
2007-05-09 2:43 ` H. Peter Anvin [this message]
2007-05-09 7:50 ` Alex Riesen
2007-05-09 16:58 ` H. Peter Anvin
2007-05-09 21:39 ` Alex Riesen
2007-05-09 22:44 ` H. Peter Anvin
2007-05-10 6:44 ` Junio C Hamano
2007-05-10 7:55 ` Johannes Sixt
2007-05-10 22:04 ` Shawn O. Pearce
2007-05-11 6:04 ` Junio C Hamano
2007-05-11 15:56 ` Linus Torvalds
2007-05-11 17:28 ` Junio C Hamano
2007-05-11 4:36 ` [PATCH] apply: do not get confused by symlinks in the middle Junio C Hamano
2007-05-12 0:32 ` git rebase chokes on directory -> symlink -> directory Junio C Hamano
2007-05-12 0:35 ` H. Peter Anvin
2007-05-14 4:37 ` Junio C Hamano
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=46413565.3090503@zytor.com \
--to=hpa@zytor$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=raa.lkml@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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