From: "H. Peter Anvin" <hpa@zytor•com>
To: Git Mailing List <git@vger•kernel.org>
Subject: git rebase chokes on directory -> symlink -> directory
Date: Mon, 07 May 2007 18:08:12 -0700 [thread overview]
Message-ID: <463FCD7C.4020009@zytor.com> (raw)
The following tree:
http://git.kernel.org/?p=linux/kernel/git/hpa/linux-2.6-newsetup.git;a=summary
... has one commit which changes arch/x86_64/boot from a directory to a
symlink, and another one which changes it back. Apparently as a result,
git rebase dies horribly; on the first change it requires manual fixup,
but it crashes on the second, with or without -m.
The specific task attempted is to rebase the main branch of that tree
onto the current Linus tree, a989705c4cf6e6c1a339c95f9daf658b4ba88ca8.
-hpa
next reply other threads:[~2007-05-08 1:08 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-08 1:08 H. Peter Anvin [this message]
2007-05-08 21:50 ` git rebase chokes on directory -> symlink -> directory Alex Riesen
2007-05-09 2:43 ` H. Peter Anvin
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=463FCD7C.4020009@zytor.com \
--to=hpa@zytor$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/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