public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Junio C Hamano <junkio@cox•net>
To: "H. Peter Anvin" <hpa@zytor•com>
Cc: Alex Riesen <raa.lkml@gmail•com>, Git Mailing List <git@vger•kernel.org>
Subject: Re: git rebase chokes on directory -> symlink -> directory
Date: Fri, 11 May 2007 17:32:43 -0700	[thread overview]
Message-ID: <7vps569904.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <46413565.3090503@zytor.com> (H. Peter Anvin's message of "Tue, 08 May 2007 19:43:49 -0700")

"H. Peter Anvin" <hpa@zytor•com> writes:

> 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 :-/

I've tried to redo your rebase using:

	apply: do not get confused by symlinks in the middle

patch on top of 'master'.  It successfully run through the end.
After rebasing f1bb07af ("rebase-1" in your repository) on to
a989705 (near the tip of Linus), I did

	git diff --stat --summary a989705...f1bb07af
        git diff --stat --summary a989705...HEAD

(that is, "show me the change since the merge base") and the
results from these two diffs match exactly.

So I think I can declare victory for now ;-).

However.

I usually have "[apply] whitespace = strip" in my ~/.gitconfig,
but during this verification run, I disabled it to keep rebase
from falling back to 3-way merge using merge-recursive.  If I
turn it on, rebase still fails and I strongly suspect "rebase
-m" would fail the same way, although I haven't tried it (it
takes too much time).

I'll be somewhat busy this weekend, so I would welcome anybody
else beating me to fixing the problem in merge-recursive.

next prev parent reply	other threads:[~2007-05-12  0:32 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
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     ` Junio C Hamano [this message]
2007-05-12  0:35       ` git rebase chokes on directory -> symlink -> directory 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=7vps569904.fsf@assigned-by-dhcp.cox.net \
    --to=junkio@cox$(echo .)net \
    --cc=git@vger$(echo .)kernel.org \
    --cc=hpa@zytor$(echo .)com \
    --cc=raa.lkml@gmail$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox